yoavs 2004/10/29 06:30:16
Modified: catalina/src/share/org/apache/catalina/realm Tag: TOMCAT_5_0
DataSourceRealm.java
webapps/docs Tag: TOMCAT_5_0 changelog.xml
Log:
Bugzilla 31753: minor inconsistencies in JDBC and DataSourceRealm#authenticate
Revision Changes Path
No revision
No revision
1.8.2.1 +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.8
retrieving revision 1.8.2.1
diff -u -r1.8 -r1.8.2.1
--- DataSourceRealm.java 4 Jun 2004 13:50:17 -0000 1.8
+++ DataSourceRealm.java 29 Oct 2004 13:30:16 -0000 1.8.2.1
@@ -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) {
No revision
No revision
1.70.2.63 +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.70.2.62
retrieving revision 1.70.2.63
diff -u -r1.70.2.62 -r1.70.2.63
--- changelog.xml 28 Oct 2004 20:44:35 -0000 1.70.2.62
+++ changelog.xml 29 Oct 2004 13:30:16 -0000 1.70.2.63
@@ -43,6 +43,9 @@
<update>
<bug>31739</bug>: Minor documentation corrections for realm-howto and AJP
docs. (yoavs)
</update>
+ <fix>
+ <bug>31753</bug>: Minor inconsistencies in JDBC and
DataSourceRealm#authenticate. (yoavs)
+ </fix>
</changelog>
</subsection>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
