cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup ClassLoaderFactory.java

[craigmcc]

craigmcc    01/09/22 20:32:40

  Modified:    catalina/src/share/org/apache/catalina/startup
                        ClassLoaderFactory.java
  Log:
  Port update from 4.0 branch.
  
  Revision  Changes    Path
  1.3       +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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ClassLoaderFactory.java   2001/09/21 16:06:58     1.2
  +++ ClassLoaderFactory.java   2001/09/23 03:32:40     1.3
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/ClassLoaderFactory.java,v
 1.2 2001/09/21 16:06:58 craigmcc Exp $
  - * $Revision: 1.2 $
  - * $Date: 2001/09/21 16:06:58 $
  + * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/ClassLoaderFactory.java,v
 1.3 2001/09/23 03:32:40 craigmcc Exp $
  + * $Revision: 1.3 $
  + * $Date: 2001/09/23 03:32:40 $
    *
    * ====================================================================
    *
  @@ -92,7 +92,7 @@
    * </ul>
    *
    * @author Craig R. McClanahan
  - * @version $Revision: 1.2 $ $Date: 2001/09/21 16:06:58 $
  + * @version $Revision: 1.3 $ $Date: 2001/09/23 03:32:40 $
    */
   
   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);