Author: fschumacher
Date: Sat Jan 24 14:21:38 2015
New Revision: 1654522
URL: http://svn.apache.org/r1654522
Log:
Close the inputstream that was used to get the content of
the readme file. Issue reported by Coverity Scan.
Modified:
tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
Modified: tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java?rev=1654522&r1=1654521&r2=1654522&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java Sat Jan
24 14:21:38 2015
@@ -1538,9 +1538,11 @@ public class DefaultServlet extends Http
directory.getWebappPath() + readmeFile);
if (resource.isFile()) {
StringWriter buffer = new StringWriter();
- InputStream is = resource.getInputStream();
- copyRange(new InputStreamReader(is),
- new PrintWriter(buffer));
+ try (InputStream is = resource.getInputStream();
+ InputStreamReader reader = new InputStreamReader(is)) {
+ copyRange(reader, new PrintWriter(buffer));
+ } catch (IOException ignored) {
+ }
return buffer.toString();
} else {
if (debug > 10)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
