[java] close the streams after I/O failure #13096

Author: joerg1985

java/src/org/openqa/selenium/os/ExternalProcess.java

@@ -193,29 +193,26 @@ public ExternalProcess start() throws UncheckedIOException {
         throw new UncheckedIOException(ex);
       }
 
-      CircularOutputStream circular;
       try {
-        circular = new CircularOutputStream(bufferSize);
+        CircularOutputStream circular = new CircularOutputStream(bufferSize);
 
         new Thread(
                 () -> {
-                  InputStream input = process.getInputStream();
                   // use the CircularOutputStream as mandatory, we know it will never raise a
                   // IOException
-                  OutputStream output = new MultiOutputStream(circular, copyOutputTo);
-                  while (process.isAlive()) {
-                    try {
-                      // we must read the output to ensure the process will not lock up
-                      input.transferTo(output);
-                    } catch (IOException ex) {
-                      LOG.log(
-                          Level.WARNING,
-                          "failed to copy the output of process " + process.pid(),
-                          ex);
-                    }
+                  try (InputStream input = process.getInputStream();
+                      OutputStream output = new MultiOutputStream(circular, copyOutputTo)) {
+                    // we must read the output to ensure the process will not lock up
+                    input.transferTo(output);
+                  } catch (IOException ex) {
+                    LOG.log(
+                        Level.WARNING, "failed to copy the output of process " + process.pid(), ex);
                   }
+                  LOG.log(Level.FINE, "completed to copy the output of process " + process.pid());
                 })
             .start();
+
+        return new ExternalProcess(process, circular);
       } catch (Throwable t) {
         // ensure we do not leak a process in case of failures
         try {
@@ -225,8 +222,6 @@ public ExternalProcess start() throws UncheckedIOException {
         }
         throw t;
       }
-
-      return new ExternalProcess(process, circular);
     }
   }