You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2014/03/25 23:56:39 UTC

svn commit: r1581573 - /tomcat/trunk/java/org/apache/catalina/core/StandardContext.java

Author: markt
Date: Tue Mar 25 22:56:39 2014
New Revision: 1581573

URL: http://svn.apache.org/r1581573
Log:
try with resources

Modified:
    tomcat/trunk/java/org/apache/catalina/core/StandardContext.java

Modified: tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardContext.java?rev=1581573&r1=1581572&r2=1581573&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardContext.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardContext.java Tue Mar 25 22:56:39 2014
@@ -6174,9 +6174,7 @@ public class StandardContext extends Con
             return "";
         }
         StringBuilder sb = new StringBuilder();
-        BufferedReader br = null;
-        try {
-            br = new BufferedReader(new InputStreamReader(stream));
+        try (BufferedReader br = new BufferedReader(new InputStreamReader(stream))) {
             String strRead = "";
             while (strRead != null) {
                 sb.append(strRead);
@@ -6184,12 +6182,6 @@ public class StandardContext extends Con
             }
         } catch (IOException e) {
             return "";
-        } finally {
-            if (br != null) {
-                try {
-                    br.close();
-                } catch (IOException ioe) {/*Ignore*/}
-            }
         }
 
         return sb.toString();



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org