Java: Replacing ByteArrayOutputStream with CircularOutputStream to pr…

…event OOM exception. Fixes issue #427
SeleniumHQ · Jan 28, 2016 · d4a21ae · d4a21ae
1 parent 976b5e9
commit d4a21ae
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/java/client/src/org/openqa/selenium/os/BUCK b/java/client/src/org/openqa/selenium/os/BUCK
@@ -3,6 +3,7 @@ java_library(
   srcs = glob(['*.java']),
   deps = [
     '//java/client/src/org/openqa/selenium:webdriver-api',
+    '//java/client/src/org/openqa/selenium/io',
     '//third_party/java/commons-exec:commons-exec',
     '//third_party/java/guava:guava',
     '//third_party/java/jna:jna',

diff --git a/java/client/src/org/openqa/selenium/os/UnixProcess.java b/java/client/src/org/openqa/selenium/os/UnixProcess.java
@@ -31,9 +31,9 @@
 import org.apache.commons.exec.Executor;
 import org.apache.commons.exec.PumpStreamHandler;
 import org.openqa.selenium.WebDriverException;
+import org.openqa.selenium.io.CircularOutputStream;
 
 import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.IOException;
 import java.io.OutputStream;
@@ -46,7 +46,7 @@
 class UnixProcess implements OsProcess {
   private static final Logger log = Logger.getLogger(UnixProcess.class.getName());
 
-  private final ByteArrayOutputStream inputOut = new ByteArrayOutputStream();
+  private final CircularOutputStream inputOut = new CircularOutputStream(null);
   private volatile String allInput;
   private final DefaultExecuteResultHandler handler = new DefaultExecuteResultHandler();
   private final Executor executor = new DaemonExecutor();
@@ -178,7 +178,7 @@ public String getStdOut() {
       throw new IllegalStateException(
           "Cannot get output before executing command line: " + cl);
     }
-    return new String(inputOut.toByteArray());
+    return inputOut.toString();
   }
 
   public void setInput(String allInput) {

diff --git a/java/client/src/org/openqa/selenium/os/build.desc b/java/client/src/org/openqa/selenium/os/build.desc
@@ -3,6 +3,7 @@ java_library(name = "os",
   srcs = [ "*.java" ],
   deps = [
     "//java/client/src/org/openqa/selenium:base",
+    "//java/client/src/org/openqa/selenium/io",
     "//third_party/java/commons-exec",
     "//third_party/java/guava",
     "//third_party/java/jna",