Author: markt Date: Thu May 31 10:02:43 2012 New Revision: 1344634 URL: http://svn.apache.org/viewvc?rev=1344634&view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53225 Fix ISE "zip file closed" when urlCacheProtection="false" in the JreMemoryLeakPreventionListener
Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/scan/FileUrlJar.java tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc7.0.x/trunk/ ------------------------------------------------------------------------------ Merged /tomcat/trunk:r1344629 Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/scan/FileUrlJar.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/scan/FileUrlJar.java?rev=1344634&r1=1344633&r2=1344634&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/scan/FileUrlJar.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/scan/FileUrlJar.java Thu May 31 10:02:43 2012 @@ -37,6 +37,7 @@ public class FileUrlJar implements Jar { public FileUrlJar(URL url) throws IOException { JarURLConnection jarConn = (JarURLConnection) url.openConnection(); + jarConn.setUseCaches(false); jarFile = jarConn.getJarFile(); } Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1344634&r1=1344633&r2=1344634&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Thu May 31 10:02:43 2012 @@ -140,6 +140,12 @@ annotations. Patch provided by Violeta Georgieva. (markt) </fix> <fix> + <bug>53225</bug>: Fix an IllegalStateException due to the JAR file being + closed when accessing static resources in a JAR file when + <code>urlCacheProtection="false"</code> in the + <code>JreMemoryLeakPreventionListener</code>. (markt) + </fix> + <fix> <bug>53267</bug>: Ensure that using the GC Daemon Protection feature of the <code>JreMemoryLeakPreventionListener</code> does not trigger a full GC every hour. (markt) --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org