yoavs 2004/10/29 06:22:47 Modified: catalina/src/share/org/apache/catalina/realm DataSourceRealm.java webapps/docs changelog.xml Log: Bugzilla 31753: minor inconsistencies between JDBC and DataSourceRealm#authenticate Revision Changes Path 1.10 +6 -3 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/realm/DataSourceRealm.java Index: DataSourceRealm.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/realm/DataSourceRealm.java,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- DataSourceRealm.java 23 Jun 2004 13:51:37 -0000 1.9 +++ DataSourceRealm.java 29 Oct 2004 13:22:47 -0000 1.10 @@ -343,7 +343,7 @@ String dbCredentials = null; stmt = credentials(dbConnection, username); rs = stmt.executeQuery(); - while (rs.next()) { + if (rs.next()) { dbCredentials = rs.getString(1); } rs.close(); @@ -379,7 +379,10 @@ stmt = roles(dbConnection, username); rs = stmt.executeQuery(); while (rs.next()) { - list.add(rs.getString(1).trim()); + String role = rs.getString(1); + if(role != null) { + list.add(role.trim()); + } } } finally { if (rs != null) { 1.158 +3 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml Index: changelog.xml =================================================================== RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v retrieving revision 1.157 retrieving revision 1.158 diff -u -r1.157 -r1.158 --- changelog.xml 28 Oct 2004 20:54:49 -0000 1.157 +++ changelog.xml 29 Oct 2004 13:22:47 -0000 1.158 @@ -102,6 +102,9 @@ <update> <bug>31739</bug>: Minor realm-howto and AJP connector doc updates. (yoavs) </update> + <fix> + <bug>31753</bug>: Minor inconsistency between JDBC and DataSourceRealm#authenticate. (yoavs) + </fix> </changelog> </subsection>
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]