Author: markt Date: Tue May 14 11:54:56 2013 New Revision: 1482309 URL: http://svn.apache.org/r1482309 Log: Prevent possible WAR file locking when reading context.xml from WAR
Modified: tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java Modified: tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java?rev=1482309&r1=1482308&r2=1482309&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java (original) +++ tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java Tue May 14 11:54:56 2013 @@ -28,6 +28,7 @@ import java.net.JarURLConnection; import java.net.MalformedURLException; import java.net.URISyntaxException; import java.net.URL; +import java.net.URLConnection; import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; @@ -560,7 +561,9 @@ public class ContextConfig implements Li try { source = new InputSource(contextXml.toString()); - stream = contextXml.openStream(); + URLConnection xmlConn = contextXml.openConnection(); + xmlConn.setUseCaches(false); + stream = xmlConn.getInputStream(); } catch (Exception e) { log.error(sm.getString("contextConfig.contextMissing", contextXml) , e); --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org