Author: markt Date: Tue Sep 4 19:14:45 2007 New Revision: 572859 URL: http://svn.apache.org/viewvc?rev=572859&view=rev Log: Improve fix for 33774 by adding check for alternative exception to the remaining point where it could be seen.
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/JNDIRealm.java Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/JNDIRealm.java URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/JNDIRealm.java?rev=572859&r1=572858&r2=572859&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/JNDIRealm.java (original) +++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/JNDIRealm.java Tue Sep 4 19:14:45 2007 @@ -1549,6 +1549,21 @@ // Try the authentication again. principal = getPrincipal(context, username); + } catch (ServiceUnavailableException e) { + + // log the exception so we know it's there. + containerLog.warn(sm.getString("jndiRealm.exception"), e); + + // close the connection so we know it will be reopened. + if (context != null) + close(context); + + // open a new directory context. + context = open(); + + // Try the authentication again. + principal = getPrincipal(context, username); + } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]