Author: violetagg
Date: Mon Dec 8 08:20:35 2014
New Revision: 1643761
URL: http://svn.apache.org/r1643761
Log:
Close the InputStream after retrieving the last modification time from
URLConnection.
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=1643761&r1=1643760&r2=1643761&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java Mon Dec 8
08:20:35 2014
@@ -1460,20 +1460,42 @@ public class ContextConfig implements Li
long hostTimeStamp = 0;
if (globalWebXml != null) {
+ URLConnection uc = null;
try {
URL url = new URL(globalWebXml.getSystemId());
- globalTimeStamp = url.openConnection().getLastModified();
+ uc = url.openConnection();
+ globalTimeStamp = uc.getLastModified();
} catch (IOException e) {
globalTimeStamp = -1;
+ } finally {
+ if (uc != null) {
+ try {
+ uc.getInputStream().close();
+ } catch (IOException e) {
+ ExceptionUtils.handleThrowable(e);
+ globalTimeStamp = -1;
+ }
+ }
}
}
if (hostWebXml != null) {
+ URLConnection uc = null;
try {
URL url = new URL(hostWebXml.getSystemId());
- hostTimeStamp = url.openConnection().getLastModified();
+ uc = url.openConnection();
+ hostTimeStamp = uc.getLastModified();
} catch (IOException e) {
hostTimeStamp = -1;
+ } finally {
+ if (uc != null) {
+ try {
+ uc.getInputStream().close();
+ } catch (IOException e) {
+ ExceptionUtils.handleThrowable(e);
+ globalTimeStamp = -1;
+ }
+ }
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
