Author: violetagg
Date: Wed Sep 3 20:11:53 2014
New Revision: 1622344
URL: http://svn.apache.org/r1622344
Log:
Merged revision 1622312 from tomcat/trunk:
Fix some potential resource leaks when reading files and other resources.
Reported by Coverity Scan.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/util/CharsetMapper.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1622312
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java?rev=1622344&r1=1622343&r2=1622344&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
Wed Sep 3 20:11:53 2014
@@ -2677,6 +2677,12 @@ public class ContextConfig implements Li
fragment.setDistributable(true);
}
} finally {
+ if (stream != null) {
+ try {
+ stream.close();
+ } catch (IOException e) {
+ }
+ }
fragment.setURL(file.toURI().toURL());
if (fragment.getName() == null) {
fragment.setName(fragment.getURL().toString());
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/util/CharsetMapper.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/util/CharsetMapper.java?rev=1622344&r1=1622343&r2=1622344&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/util/CharsetMapper.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/util/CharsetMapper.java Wed
Sep 3 20:11:53 2014
@@ -18,6 +18,7 @@
package org.apache.catalina.util;
+import java.io.IOException;
import java.io.InputStream;
import java.util.Locale;
import java.util.Properties;
@@ -69,14 +70,20 @@ public class CharsetMapper {
* resource could not be loaded for any reason.
*/
public CharsetMapper(String name) {
+ InputStream stream = null;
try {
- InputStream stream =
- this.getClass().getResourceAsStream(name);
+ stream = this.getClass().getResourceAsStream(name);
map.load(stream);
- stream.close();
} catch (Throwable t) {
ExceptionUtils.handleThrowable(t);
throw new IllegalArgumentException(t.toString());
+ } finally {
+ if (stream != null) {
+ try {
+ stream.close();
+ } catch (IOException e) {
+ }
+ }
}
}
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=1622344&r1=1622343&r2=1622344&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Wed Sep 3 20:11:53 2014
@@ -142,8 +142,8 @@
Locale. (markt)
</fix>
<fix>
- Fix some potential resource leaks when reading property files. Reported
- by Coverity Scan. (violetagg)
+ Fix some potential resource leaks when reading properties, files and
+ other resources. Reported by Coverity Scan. (violetagg)
</fix>
</changelog>
</subsection>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
