allow custom ErrorHandler for HTTPCommandExecutor

Signed-off-by: Luke Inman-Semerau <[email protected]>

Author: Jonahss

java/client/src/org/openqa/selenium/remote/ErrorHandler.java

@@ -18,6 +18,8 @@
 
 package org.openqa.selenium.remote;
 
+import static org.openqa.selenium.remote.ErrorCodes.SUCCESS;
+
 import com.google.common.base.Function;
 import com.google.common.base.Predicates;
 import com.google.common.base.Throwables;
@@ -33,8 +35,6 @@
 import java.util.List;
 import java.util.Map;
 
-import static org.openqa.selenium.remote.ErrorCodes.SUCCESS;
-
 /**
  * Maps exceptions to status codes for sending over the wire.
  * 
@@ -54,7 +54,7 @@ public class ErrorHandler {
   private static final String UNKNOWN_METHOD = "<anonymous method>";
   private static final String UNKNOWN_FILE = null;
 
-  private final ErrorCodes errorCodes = new ErrorCodes();
+  private ErrorCodes errorCodes;
 
   private boolean includeServerErrors;
 
@@ -68,6 +68,17 @@ public ErrorHandler() {
    */
   public ErrorHandler(boolean includeServerErrors) {
     this.includeServerErrors = includeServerErrors;
+    this.errorCodes = new ErrorCodes();
+  }
+
+  /**
+   * @param includeServerErrors Whether to include server-side details in thrown exceptions if the
+   *        information is available.
+   * @param codes The ErrorCodes object to use for linking error codes to exceptions.
+   */
+  public ErrorHandler(ErrorCodes codes, boolean includeServerErrors) {
+    this.includeServerErrors = includeServerErrors;
+    this.errorCodes = codes;
   }
 
   public boolean isIncludeServerErrors() {

java/client/src/org/openqa/selenium/remote/RemoteWebDriver.java

@@ -81,8 +81,7 @@ public class RemoteWebDriver implements WebDriver, JavascriptExecutor,
   private static final Logger logger = Logger.getLogger(RemoteWebDriver.class.getName());
   private Level level = Level.FINE;
 
-  private final ErrorHandler errorHandler = new ErrorHandler();
-
+  private ErrorHandler errorHandler;
   private CommandExecutor executor;
   private Capabilities capabilities;
   private SessionId sessionId;
@@ -103,6 +102,7 @@ protected RemoteWebDriver() {
 
   public RemoteWebDriver(CommandExecutor executor, Capabilities desiredCapabilities,
       Capabilities requiredCapabilities) {
+    this.errorHandler = new ErrorHandler();
     this.executor = executor;
 
     init(desiredCapabilities, requiredCapabilities);
@@ -285,6 +285,10 @@ public ErrorHandler getErrorHandler() {
     return errorHandler;
   }
 
+  public void setErrorHandler(ErrorHandler handler) {
+    this.errorHandler = handler;
+  }
+
   public CommandExecutor getCommandExecutor() {
     return executor;
   }