Separating responsibilities of demux and circular buffer.

Also we should not silently ignore FileNotFoundException for a log file.

Author: barancev

java/client/src/org/openqa/selenium/firefox/FirefoxBinary.java

@@ -35,9 +35,12 @@
 import org.openqa.selenium.firefox.internal.Executable;
 import org.openqa.selenium.io.CircularOutputStream;
 import org.openqa.selenium.io.FileHandler;
+import org.openqa.selenium.io.MultiOutputStream;
 import org.openqa.selenium.os.CommandLine;
 
 import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.nio.file.Files;
@@ -352,13 +355,15 @@ public void quit() {
     }
   }
 
-  private OutputStream getDefaultOutputStream() {
+  private OutputStream getDefaultOutputStream() throws FileNotFoundException {
     String firefoxLogFile = System.getProperty(FirefoxDriver.SystemProperty.BROWSER_LOGFILE);
+    if (firefoxLogFile == null) {
+      return new CircularOutputStream();
+    }
     if ("/dev/stdout".equals(firefoxLogFile)) {
       return System.out;
     }
-    File logFile = firefoxLogFile == null ? null : new File(firefoxLogFile);
-    return new CircularOutputStream(logFile);
+    return new MultiOutputStream(new CircularOutputStream(), new FileOutputStream(firefoxLogFile));
   }
 
   /**

java/client/src/org/openqa/selenium/firefox/internal/NewProfileExtensionConnection.java

@@ -26,6 +26,7 @@
 import org.openqa.selenium.firefox.FirefoxProfile;
 import org.openqa.selenium.firefox.NotConnectedException;
 import org.openqa.selenium.internal.Lock;
+import org.openqa.selenium.io.MultiOutputStream;
 import org.openqa.selenium.logging.LocalLogs;
 import org.openqa.selenium.logging.NeedsLocalLogs;
 import org.openqa.selenium.net.NetworkUtils;
@@ -35,6 +36,7 @@
 import org.openqa.selenium.io.CircularOutputStream;
 
 import java.io.File;
+import java.io.FileOutputStream;
 import java.io.IOException;
 import java.net.InetSocketAddress;
 import java.net.MalformedURLException;
@@ -48,8 +50,6 @@
 
 public class NewProfileExtensionConnection implements ExtensionConnection, NeedsLocalLogs {
 
-  private final static int BUFFER_SIZE = 4096;
-
   private static final NetworkUtils networkUtils = new NetworkUtils();
   private final long connectTimeout;
   private final FirefoxBinary process;
@@ -92,8 +92,8 @@ public void start() throws IOException {
         if ("/dev/stdout".equals(firefoxLogFile)) {
           process.setOutputWatcher(System.out);
         } else {
-          File logFile = new File(firefoxLogFile);
-          process.setOutputWatcher(new CircularOutputStream(logFile, BUFFER_SIZE));
+          process.setOutputWatcher(
+              new MultiOutputStream(new CircularOutputStream(), new FileOutputStream(firefoxLogFile)));
         }
       }
 

java/client/src/org/openqa/selenium/io/CircularOutputStream.java

@@ -17,9 +17,6 @@
 
 package org.openqa.selenium.io;
 
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
 
@@ -32,25 +29,13 @@ public class CircularOutputStream extends OutputStream {
   private int end;
   private boolean filled = false;
   private byte[] buffer;
-  private FileOutputStream out_log;
 
-  public CircularOutputStream(File outputFile, int maxSize) {
+  public CircularOutputStream(int maxSize) {
     buffer = new byte[maxSize];
-    if (outputFile != null) {
-      try {
-        out_log = new FileOutputStream(outputFile);
-      } catch (FileNotFoundException e) {
-        out_log = null;
-      }
-    }
   }
 
-  public CircularOutputStream(File outputFile) {
-    this(outputFile, DEFAULT_SIZE);
-  }
-
-  public CircularOutputStream(int maxSize) {
-    this(null, maxSize);
+  public CircularOutputStream() {
+    this(DEFAULT_SIZE);
   }
 
   @Override
@@ -65,10 +50,6 @@ public void write(int b) throws IOException {
     }
 
     buffer[end++] = (byte) b;
-    if (out_log != null) {
-      out_log.write(b);
-    }
-
   }
 
   @Override