Author: violetagg
Date: Mon Dec 8 08:51:47 2014
New Revision: 1643764
URL: http://svn.apache.org/r1643764
Log:
Merged revision 1643761 from tomcat/trunk:
Close the InputStream after retrieving the last modification time from
URLConnection.
Modified:
tomcat/tc8.0.x/trunk/ (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc8.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 8 08:51:47 2014
@@ -1 +1 @@
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1643002,1643045,1643054-1643055,1643066,1643121,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734
+/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1643002,1643045,1643054-1643055,1643066,1643121,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java?rev=1643764&r1=1643763&r2=1643764&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
Mon Dec 8 08:51:47 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;
+ }
+ }
}
}
Modified: tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml?rev=1643764&r1=1643763&r2=1643764&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Mon Dec 8 08:51:47 2014
@@ -134,6 +134,10 @@
Remove the obsolete <code>jndi</code> protocol usage from the scanning
process performed by StandardJarScanner. (violetagg)
</fix>
+ <fix>
+ Prevent file descriptors leak and ensure that files are closed after
+ retrieving the last modification time. (violetagg)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
