remm 2003/10/06 02:19:40
Modified: catalina/src/share/org/apache/catalina/realm JAASRealm.java
LocalStrings.properties
Log:
- Adjust logging according to suggestions from bug 23547, submitted by
Adam Hardy.
Revision Changes Path
1.4 +7 -9
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/realm/JAASRealm.java
Index: JAASRealm.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/realm/JAASRealm.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- JAASRealm.java 2 Sep 2003 21:22:05 -0000 1.3
+++ JAASRealm.java 6 Oct 2003 09:19:40 -0000 1.4
@@ -312,9 +312,7 @@
(appName, new JAASCallbackHandler(this, username,
credentials));
} catch (Throwable e) {
- log.debug("Error initializing JAAS: " + e.toString());
-
- log.debug(sm.getString("jaasRealm.loginException", username), e);
+ log.error(sm.getString("jaasRealm.unexpectedError"), e);
return (null);
} finally {
Thread.currentThread().setContextClassLoader(ocl);
@@ -346,10 +344,10 @@
log.debug(sm.getString("jaasRealm.failedLogin", username));
return (null);
} catch (LoginException e) {
- log.debug(sm.getString("jaasRealm.loginException", username), e);
+ log.warn(sm.getString("jaasRealm.loginException", username), e);
return (null);
} catch (Throwable e) {
- log.debug("Unexpected error", e);
+ log.error(sm.getString("jaasRealm.unexpectedError"), e);
return (null);
}
1.4 +2 -1
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/realm/LocalStrings.properties
Index: LocalStrings.properties
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/realm/LocalStrings.properties,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- LocalStrings.properties 8 Dec 2002 13:42:10 -0000 1.3
+++ LocalStrings.properties 6 Oct 2003 09:19:40 -0000 1.4
@@ -9,6 +9,7 @@
jaasRealm.credentialExpired=Username {0} NOT authenticated due to expired credential
jaasRealm.failedLogin=Username {0} NOT authenticated due to failed login
jaasRealm.loginException=Login exception authenticating username {0}
+jaasRealm.unexpectedError=Unexpected error
jdbcRealm.authenticateFailure=Username {0} NOT successfully authenticated
jdbcRealm.authenticateSuccess=Username {0} successfully authenticated
jdbcRealm.close=Exception closing database connection
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
