yoavs 2004/08/30 13:18:54
Modified: webapps/docs Tag: TOMCAT_5_0 changelog.xml
webapps/manager/WEB-INF/classes/org/apache/catalina/manager
Tag: TOMCAT_5_0 ManagerServlet.java
Log:
Fix to ManagerServlet to not cache context.xml stream: Bugzilla 29526.
Revision Changes Path
No revision
No revision
1.70.2.18 +7 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml
Index: changelog.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v
retrieving revision 1.70.2.17
retrieving revision 1.70.2.18
diff -u -r1.70.2.17 -r1.70.2.18
--- changelog.xml 30 Aug 2004 19:43:26 -0000 1.70.2.17
+++ changelog.xml 30 Aug 2004 20:18:53 -0000 1.70.2.18
@@ -35,6 +35,13 @@
</fix>
</changelog>
</subsection>
+ <subsection name="Webapps">
+ <changelog>
+ <fix>
+ <bug>29526</bug>: Manager redeployment locked JAR because of context.xml
stream. (yoavs)
+ </fix>
+ </changelog>
+ </subsection>
</section>
<section name="Tomcat 5.0.28 (yoavs)">
No revision
No revision
1.18.2.1 +6 -2
jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/ManagerServlet.java
Index: ManagerServlet.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/ManagerServlet.java,v
retrieving revision 1.18
retrieving revision 1.18.2.1
diff -u -r1.18 -r1.18.2.1
--- ManagerServlet.java 27 Apr 2004 23:02:24 -0000 1.18
+++ ManagerServlet.java 30 Aug 2004 20:18:54 -0000 1.18.2.1
@@ -27,6 +27,7 @@
import java.io.IOException;
import java.io.PrintWriter;
import java.net.URL;
+import java.net.URLConnection;
import java.net.MalformedURLException;
import java.util.Iterator;
import java.util.jar.JarEntry;
@@ -845,7 +846,10 @@
}
contextXml = new URL(contextWar +
"META-INF/context.xml");
- stream = contextXml.openStream();
+ URLConnection jarUrlConnection=contextXml.openConnection();
+ jarUrlConnection.setUseCaches(false);
+ stream = jarUrlConnection.getInputStream();;
+
// WAR contains META-INF/context.xml resource - install
deployer.install(new URL(contextWar));
return;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
