markt 2004/06/18 16:21:57 Modified: catalina/src/share/org/apache/catalina/realm JNDIRealm.java Log: Fix bug 23572. The alternateURL should be used in more cases than just a naming excetion (eg network error) - Patch provided by Jean-Yves Collot Also fixed some unused imports identified by Eclipse Revision Changes Path 1.18 +5 -7 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/realm/JNDIRealm.java Index: JNDIRealm.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/realm/JNDIRealm.java,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- JNDIRealm.java 6 Feb 2004 01:49:48 -0000 1.17 +++ JNDIRealm.java 18 Jun 2004 23:21:57 -0000 1.18 @@ -86,8 +86,6 @@ import javax.naming.directory.SearchControls; import javax.naming.directory.SearchResult; import org.apache.catalina.LifecycleException; -import org.apache.catalina.Realm; -import org.apache.catalina.util.StringManager; import org.apache.catalina.util.Base64; @@ -1519,7 +1517,7 @@ // Ensure that we have a directory context available context = new InitialDirContext(getDirectoryContextEnvironment()); - } catch (NamingException e) { + } catch (Exception e) { connectionAttempt = 1;
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]