This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new 0c4e6ee7c3 Use try-with-resources to avoid potential resource leak
0c4e6ee7c3 is described below
commit 0c4e6ee7c32cf211d924c3d4fff5ab68ee47bcc3
Author: Mark Thomas <[email protected]>
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 6a21b1cbab..33c192ffd5 100644
--- a/java/org/apache/catalina/ssi/SSIServlet.java
+++ b/java/org/apache/catalina/ssi/SSIServlet.java
@@ -215,19 +215,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: [email protected]
For additional commands, e-mail: [email protected]
