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 3470c22e20 Explicitly close streams
3470c22e20 is described below
commit 3470c22e2073287762af28c946a1a665ba541c4a
Author: Mark Thomas <[email protected]>
AuthorDate: Tue Jul 4 20:09:51 2023 +0100
Explicitly close streams
---
java/org/apache/catalina/ssi/SSIExec.java | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/java/org/apache/catalina/ssi/SSIExec.java
b/java/org/apache/catalina/ssi/SSIExec.java
index 2f7493c207..729281be7b 100644
--- a/java/org/apache/catalina/ssi/SSIExec.java
+++ b/java/org/apache/catalina/ssi/SSIExec.java
@@ -58,13 +58,12 @@ public class SSIExec implements SSICommand {
Runtime rt = Runtime.getRuntime();
Process proc = rt.exec(substitutedValue);
foundProgram = true;
- BufferedReader stdOutReader = new BufferedReader(
- new InputStreamReader(proc.getInputStream()));
- BufferedReader stdErrReader = new BufferedReader(
- new InputStreamReader(proc.getErrorStream()));
char[] buf = new char[BUFFER_SIZE];
- IOTools.flow(stdErrReader, writer, buf);
- IOTools.flow(stdOutReader, writer, buf);
+ try (BufferedReader stdOutReader = new BufferedReader(new
InputStreamReader(proc.getInputStream()));
+ BufferedReader stdErrReader = new BufferedReader(new
InputStreamReader(proc.getErrorStream()));) {
+ IOTools.flow(stdErrReader, writer, buf);
+ IOTools.flow(stdOutReader, writer, buf);
+ }
proc.waitFor();
lastModified = System.currentTimeMillis();
} catch (InterruptedException e) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
