remm 2004/02/24 04:09:06 Modified: catalina/src/share/org/apache/catalina/realm DataSourceRealm.java Log: - Port fix for NPE is data source realm (bug 27077). - I didn't test this. Revision Changes Path 1.6 +6 -5 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.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- DataSourceRealm.java 29 Jan 2004 10:47:39 -0000 1.5 +++ DataSourceRealm.java 24 Feb 2004 12:09:06 -0000 1.6 @@ -390,7 +390,7 @@ stmt = credentials(dbConnection, username); rs = stmt.executeQuery(); while (rs.next()) { - dbCredentials = rs.getString(1).trim(); + dbCredentials = rs.getString(1); } rs.close(); rs = null; @@ -399,6 +399,7 @@ if (dbCredentials == null) { return (null); } + dbCredentials = dbCredentials.trim(); // Validate the user's credentials boolean validated = false;
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]