You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by am...@apache.org on 2003/11/26 19:46:02 UTC

cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/loader WebappLoader.java

amyroh      2003/11/26 10:46:02

  Modified:    catalina/src/share/org/apache/catalina/loader
                        WebappLoader.java
  Log:
  Catch exception when there is an empty jar file.  Ignores the exception and continue loading other jar files in the dir - bugtraq 4670099.
  
  Revision  Changes    Path
  1.24      +10 -3     jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/loader/WebappLoader.java
  
  Index: WebappLoader.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/loader/WebappLoader.java,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- WebappLoader.java	22 Sep 2003 12:31:41 -0000	1.23
  +++ WebappLoader.java	26 Nov 2003 18:46:02 -0000	1.24
  @@ -1109,8 +1109,15 @@
                               continue;
                       }
   
  -                    JarFile jarFile = new JarFile(destFile);
  -                    classLoader.addJar(filename, jarFile, destFile);
  +                    try {
  +                        JarFile jarFile = new JarFile(destFile);
  +                        classLoader.addJar(filename, jarFile, destFile);
  +                    } catch (Exception ex) {
  +                        // Catch the exception if there is an empty jar file
  +                        // Should ignore and continute loading other jar files 
  +                        // in the dir
  +                    }
  +                    
                       loaderRepositories.add( filename );
   
                   }
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org