[tomcat] branch 8.5.x updated: Use try-with-resources to avoid potential resource leak

[markt]

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/8.5.x by this push:
     new 32e79883d0 Use try-with-resources to avoid potential resource leak
32e79883d0 is described below

commit 32e79883d075e239a836d3506932b643e4c9f054
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Jul 5 14:27:44 2023 +0100

    Use try-with-resources to avoid potential resource leak
    
    Identified by Coverity Scan
---
 java/org/apache/catalina/ssi/SSIServlet.java | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/java/org/apache/catalina/ssi/SSIServlet.java 
b/java/org/apache/catalina/ssi/SSIServlet.java
index 17cb5e116a..1adb61ed79 100644
--- a/java/org/apache/catalina/ssi/SSIServlet.java
+++ b/java/org/apache/catalina/ssi/SSIServlet.java
@@ -217,19 +217,19 @@ public class SSIServlet extends HttpServlet {
         } else {
             isr = new InputStreamReader(resourceInputStream, encoding);
         }
-        BufferedReader bufferedReader = new BufferedReader(isr);
 
-        long lastModified = ssiProcessor.process(bufferedReader,
-                resourceInfo.getLastModified(), printWriter);
-        if (lastModified > 0) {
-            res.setDateHeader("last-modified", lastModified);
+        try (BufferedReader bufferedReader = new BufferedReader(isr)) {
+            long lastModified = ssiProcessor.process(bufferedReader,
+                    resourceInfo.getLastModified(), printWriter);
+            if (lastModified > 0) {
+                res.setDateHeader("last-modified", lastModified);
+            }
+            if (buffered) {
+                printWriter.flush();
+                @SuppressWarnings("null")
+                String text = stringWriter.toString();
+                res.getWriter().write(text);
+            }
         }
-        if (buffered) {
-            printWriter.flush();
-            @SuppressWarnings("null")
-            String text = stringWriter.toString();
-            res.getWriter().write(text);
-        }
-        bufferedReader.close();
     }
 }


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