remm 02/01/27 13:13:15
Modified: catalina/src/share/org/apache/catalina/core Tag:
tomcat_40_branch StandardHost.java
Log:
- Port fix for bug 5908.
Revision Changes Path
No revision
No revision
1.18.2.3 +8 -6
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardHost.java
Index: StandardHost.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardHost.java,v
retrieving revision 1.18.2.2
retrieving revision 1.18.2.3
diff -u -r1.18.2.2 -r1.18.2.3
--- StandardHost.java 9 Dec 2001 22:03:44 -0000 1.18.2.2
+++ StandardHost.java 27 Jan 2002 21:13:15 -0000 1.18.2.3
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardHost.java,v
1.18.2.2 2001/12/09 22:03:44 remm Exp $
- * $Revision: 1.18.2.2 $
- * $Date: 2001/12/09 22:03:44 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardHost.java,v
1.18.2.3 2002/01/27 21:13:15 remm Exp $
+ * $Revision: 1.18.2.3 $
+ * $Date: 2002/01/27 21:13:15 $
*
* ====================================================================
*
@@ -103,7 +103,7 @@
*
* @author Craig R. McClanahan
* @author Remy Maucherat
- * @version $Revision: 1.18.2.2 $ $Date: 2001/12/09 22:03:44 $
+ * @version $Revision: 1.18.2.3 $ $Date: 2002/01/27 21:13:15 $
*/
public class StandardHost
@@ -937,7 +937,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 (debug >= 2)
log(" Have opened JAR file successfully");
Enumeration jarEntries = jarFile.entries();
@@ -964,7 +966,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]>
