Author: schultz
Date: Tue Aug 26 21:53:11 2014
New Revision: 1620747
URL: http://svn.apache.org/r1620747
Log:
Back-ported r1620743:
- Fixed minor resource-leak [Coverity issue #45132]
_M .
M java/org/apache/catalina/startup/CatalinaProperties.java
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/CatalinaProperties.java
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1620743
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/CatalinaProperties.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/CatalinaProperties.java?rev=1620747&r1=1620746&r2=1620747&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/CatalinaProperties.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/CatalinaProperties.java
Tue Aug 26 21:53:11 2014
@@ -20,6 +20,7 @@ package org.apache.catalina.startup;
import java.io.File;
import java.io.FileInputStream;
+import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
import java.util.Enumeration;
@@ -122,11 +123,18 @@ public class CatalinaProperties {
try {
properties = new Properties();
properties.load(is);
- is.close();
} catch (Throwable t) {
handleThrowable(t);
error = t;
}
+ finally
+ {
+ try {
+ is.close();
+ } catch (IOException ioe) {
+ log.warn("Could not close catalina.properties", ioe);
+ }
+ }
}
if ((is == null) || (error != null)) {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
