remm 2005/03/24 09:12:50
Modified: catalina/src/share/org/apache/catalina/realm JNDIRealm.java
webapps/docs changelog.xml
Log:
- 33774: remove hack based on exception message and retry anyway.
Revision Changes Path
1.22 +2 -10
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/realm/JNDIRealm.java
Index: JNDIRealm.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/realm/JNDIRealm.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- JNDIRealm.java 23 Mar 2005 15:17:17 -0000 1.21
+++ JNDIRealm.java 24 Mar 2005 17:12:50 -0000 1.22
@@ -809,16 +809,8 @@
} catch (CommunicationException e) {
-
- // If contains the work closed. Then assume socket is closed.
- // If message is null, assume the worst and allow the
- // connection to be closed.
- if (e.getMessage()!=null &&
- e.getMessage().indexOf("closed") < 0)
- throw(e);
-
// log the exception so we know it's there.
- containerLog.error(sm.getString("jndiRealm.exception"), e);
+ containerLog.warn(sm.getString("jndiRealm.exception"), e);
// close the connection so we know it will be reopened.
if (context != null)
1.261 +4 -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.260
retrieving revision 1.261
diff -u -r1.260 -r1.261
--- changelog.xml 24 Mar 2005 14:42:55 -0000 1.260
+++ changelog.xml 24 Mar 2005 17:12:50 -0000 1.261
@@ -115,6 +115,10 @@
<fix>
Improve logging of filters and listeners startup errors (remm)
</fix>
+ <fix>
+ <bug>33774</bug>: Retry once in JNDI realm authenticate failure
regardless of the
+ exception message (remm)
+ </fix>
</changelog>
</subsection>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
