You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by cr...@apache.org on 2001/09/23 05:32:24 UTC
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup ClassLoaderFactory.java
craigmcc 01/09/22 20:32:24
Modified: catalina/src/share/org/apache/catalina/startup Tag:
tomcat_40_branch ClassLoaderFactory.java
Log:
When building class loaders, only leave out JAR files that contain the
trigger class *if* the trigger class is already visible (i.e. it has been
integrated into the JDK).
Revision Changes Path
No revision
No revision
1.1.2.2 +20 -4 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/ClassLoaderFactory.java
Index: ClassLoaderFactory.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/ClassLoaderFactory.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- ClassLoaderFactory.java 2001/09/21 15:59:56 1.1.2.1
+++ ClassLoaderFactory.java 2001/09/23 03:32:24 1.1.2.2
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/ClassLoaderFactory.java,v 1.1.2.1 2001/09/21 15:59:56 craigmcc Exp $
- * $Revision: 1.1.2.1 $
- * $Date: 2001/09/21 15:59:56 $
+ * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/ClassLoaderFactory.java,v 1.1.2.2 2001/09/23 03:32:24 craigmcc Exp $
+ * $Revision: 1.1.2.2 $
+ * $Date: 2001/09/23 03:32:24 $
*
* ====================================================================
*
@@ -92,7 +92,7 @@
* </ul>
*
* @author Craig R. McClanahan
- * @version $Revision: 1.1.2.1 $ $Date: 2001/09/21 15:59:56 $
+ * @version $Revision: 1.1.2.2 $ $Date: 2001/09/23 03:32:24 $
*/
public final class ClassLoaderFactory {
@@ -281,6 +281,14 @@
if (triggers == null)
return (true);
for (int i = 0; i < triggers.length; i++) {
+ Class clazz = null;
+ try {
+ clazz = Class.forName(triggers[i]);
+ } catch (Throwable t) {
+ clazz = null;
+ }
+ if (clazz == null)
+ continue;
File file = new File(directory,
triggers[i].replace('.', File.separatorChar) +
".class");
@@ -309,6 +317,14 @@
return (true);
JarFile jarFile = new JarFile(jarfile);
for (int i = 0; i < triggers.length; i++) {
+ Class clazz = null;
+ try {
+ clazz = Class.forName(triggers[i]);
+ } catch (Throwable t) {
+ clazz = null;
+ }
+ if (clazz == null)
+ continue;
String name = triggers[i].replace('.', '/') + ".class";
if (debug >= 2)
log(" Checking for " + name);