remm 01/09/20 16:46:27
Modified: catalina/src/share/org/apache/catalina/startup
Bootstrap.java
Log:
- Don't load ldap.jar if the system CL has the LDAP classes already (that's similar
to the jndi.jar hack).
Revision Changes Path
1.27 +6 -4
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/Bootstrap.java
Index: Bootstrap.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/Bootstrap.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- Bootstrap.java 2001/09/13 14:26:18 1.26
+++ Bootstrap.java 2001/09/20 23:46:27 1.27
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/Bootstrap.java,v
1.26 2001/09/13 14:26:18 glenn Exp $
- * $Revision: 1.26 $
- * $Date: 2001/09/13 14:26:18 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/Bootstrap.java,v
1.27 2001/09/20 23:46:27 remm Exp $
+ * $Revision: 1.27 $
+ * $Date: 2001/09/20 23:46:27 $
*
* ====================================================================
*
@@ -85,7 +85,7 @@
* class path and therefore not visible to application level classes.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.26 $ $Date: 2001/09/13 14:26:18 $
+ * @version $Revision: 1.27 $ $Date: 2001/09/20 23:46:27 $
*/
public final class Bootstrap {
@@ -275,6 +275,8 @@
if (!filename.endsWith(".jar"))
continue;
if ((!loadJNDI) && filename.equals("jndi.jar"))
+ continue;
+ if ((!loadJNDI) && filename.equals("ldap.jar"))
continue;
if (filename.equals("bootstrap.jar"))
continue;