remm        02/01/27 13:11:20

  Modified:    catalina/src/share/org/apache/catalina/core
                        StandardHostDeployer.java
  Log:
  - Fix bug 5908: java.lang.IllegalStateException: zip file closed.
  - Patch submitted by an anonymous user (notzippy at hotmail.com).
  
  Revision  Changes    Path
  1.3       +8 -6      
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardHostDeployer.java
  
  Index: StandardHostDeployer.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardHostDeployer.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- StandardHostDeployer.java 10 Nov 2001 00:01:54 -0000      1.2
  +++ StandardHostDeployer.java 27 Jan 2002 21:11:20 -0000      1.3
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardHostDeployer.java,v
 1.2 2001/11/10 00:01:54 craigmcc Exp $
  - * $Revision: 1.2 $
  - * $Date: 2001/11/10 00:01:54 $
  + * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardHostDeployer.java,v
 1.3 2002/01/27 21:11:20 remm Exp $
  + * $Revision: 1.3 $
  + * $Date: 2002/01/27 21:11:20 $
    *
    * ====================================================================
    *
  @@ -93,7 +93,7 @@
    * <code>StandardHost</code> implementation class.</p>
    *
    * @author Craig R. McClanahan
  - * @version $Revision: 1.2 $ $Date: 2001/11/10 00:01:54 $
  + * @version $Revision: 1.3 $ $Date: 2002/01/27 21:11:20 $
    */
   
   public class StandardHostDeployer implements Deployer {
  @@ -654,7 +654,9 @@
                   docBase.getAbsolutePath());
   
           // Expand the WAR into the new document base directory
  -        JarFile jarFile = ((JarURLConnection)war.openConnection()).getJarFile();
  +        JarURLConnection juc = (JarURLConnection) war.openConnection();
  +        juc.setUseCaches(false);
  +        JarFile jarFile = juc.getJarFile();
           if (host.getDebug() >= 2)
               host.log("  Have opened JAR file successfully");
           Enumeration jarEntries = jarFile.entries();
  @@ -681,7 +683,7 @@
               expand(input, docBase, name);
               input.close();
           }
  -        jarFile.close();        // FIXME - doesn't remove from cache!!!
  +        jarFile.close();
   
           // Return the absolute path to our new document base directory
           return (docBase.getAbsolutePath());
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>

Reply via email to