Author: markt
Date: Wed Mar 26 15:36:47 2014
New Revision: 1581890
URL: http://svn.apache.org/r1581890
Log:
More try-with-resources
Modified:
tomcat/trunk/TOMCAT-NEXT.txt
tomcat/trunk/java/org/apache/catalina/valves/rewrite/RewriteValve.java
Modified: tomcat/trunk/TOMCAT-NEXT.txt
URL:
http://svn.apache.org/viewvc/tomcat/trunk/TOMCAT-NEXT.txt?rev=1581890&r1=1581889&r2=1581890&view=diff
==============================================================================
--- tomcat/trunk/TOMCAT-NEXT.txt (original)
+++ tomcat/trunk/TOMCAT-NEXT.txt Wed Mar 26 15:36:47 2014
@@ -214,7 +214,8 @@ but possibly 7.1.x).
- Use of try with resources
- Started.
- javax.* complete
- - o.a.catalina.[ant to util] complete
+ - o.a.[catalina to el ] complete
+ - o.a.jasper in progress
- remainder TODO
- Catching multiple exceptions
- Started
Modified: tomcat/trunk/java/org/apache/catalina/valves/rewrite/RewriteValve.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/rewrite/RewriteValve.java?rev=1581890&r1=1581889&r2=1581890&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/valves/rewrite/RewriteValve.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/valves/rewrite/RewriteValve.java Wed
Mar 26 15:36:47 2014
@@ -169,18 +169,13 @@ public class RewriteValve extends ValveB
return;
}
- BufferedReader reader = new BufferedReader(
- new InputStreamReader(is, StandardCharsets.UTF_8));
-
- try {
+ try (InputStreamReader isr = new InputStreamReader(is,
StandardCharsets.UTF_8);
+ BufferedReader reader = new BufferedReader(isr)) {
parse(reader);
+ } catch (IOException ioe) {
+ container.getLogger().error("Error closing configuration", ioe);
} finally {
try {
- reader.close();
- } catch (IOException e) {
- container.getLogger().error("Error closing configuration", e);
- }
- try {
is.close();
} catch (IOException e) {
container.getLogger().error("Error closing configuration", e);
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
