Author: violetagg
Date: Wed Sep 3 16:42:46 2014
New Revision: 1622297
URL: http://svn.apache.org/r1622297
Log:
Fix some potential resource leaks when reading property files. Reported by
Coverity Scan.
Modified:
tomcat/trunk/java/org/apache/catalina/util/ServerInfo.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/util/ServerInfo.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/util/ServerInfo.java?rev=1622297&r1=1622296&r2=1622297&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/util/ServerInfo.java (original)
+++ tomcat/trunk/java/org/apache/catalina/util/ServerInfo.java Wed Sep 3
16:42:46 2014
@@ -58,12 +58,10 @@ public class ServerInfo {
String built = null;
String number = null;
- try {
- InputStream is = ServerInfo.class.getResourceAsStream
- ("/org/apache/catalina/util/ServerInfo.properties");
- Properties props = new Properties();
+ Properties props = new Properties();
+ try (InputStream is = ServerInfo.class.getResourceAsStream
+ ("/org/apache/catalina/util/ServerInfo.properties")) {
props.load(is);
- is.close();
info = props.getProperty("server.info");
built = props.getProperty("server.built");
number = props.getProperty("server.number");
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1622297&r1=1622296&r2=1622297&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Wed Sep 3 16:42:46 2014
@@ -98,6 +98,10 @@
Fix a potential resource leak when reading MANIFEST.MF file for
extension dependencies reported by Coverity Scan. (violetagg)
</fix>
+ <fix>
+ Fix some potential resource leaks when reading property files. Reported
+ by Coverity Scan. (violetagg)
+ </fix>
</changelog>
</subsection>
<subsection name="Jasper">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
