ResultType.EXCEPTION and ResultType.ERROR are handled the exact same …

…way, so remove one of them and simplify some code.
SeleniumHQ · Dec 31, 2013 · 2118dff · 2118dff
1 parent 0b5c69e
commit 2118dff
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 8 deletions.
diff --git a/java/server/src/org/openqa/selenium/remote/server/JsonHttpRemoteConfig.java b/java/server/src/org/openqa/selenium/remote/server/JsonHttpRemoteConfig.java
@@ -222,7 +222,6 @@ private void setUpMappings(DriverSessions driverSessions, Logger logger) {
 
     Result jsonErrorResult = new Result(MimeType.EMPTY,
                                         new JsonErrorExceptionResult(EXCEPTION, RESPONSE));
-    addGlobalHandler(ResultType.EXCEPTION, jsonErrorResult);
     addGlobalHandler(ResultType.ERROR, jsonErrorResult);
 
     Result xdrpcResult = new Result(MimeType.CROSS_DOMAIN_RPC,

diff --git a/java/server/src/org/openqa/selenium/remote/server/rest/ResultConfig.java b/java/server/src/org/openqa/selenium/remote/server/rest/ResultConfig.java
@@ -216,7 +216,7 @@ public void handle(String pathInfo, final HttpRequest request,
     } catch (SessionNotFoundException e){
       throw e;
     } catch (Exception e) {
-      result = ResultType.EXCEPTION;
+      result = ResultType.ERROR;
       log.log(Level.WARNING, "Exception thrown", e);
 
       Throwable toUse = getRootExceptionCause(e);
@@ -228,7 +228,7 @@ public void handle(String pathInfo, final HttpRequest request,
       }
     } catch (Error e) {
       log.info("Error: " + e.getMessage());
-      result = ResultType.EXCEPTION;
+      result = ResultType.ERROR;
       request.setAttribute("exception", e);
     }
 
@@ -248,7 +248,7 @@ public void handle(String pathInfo, final HttpRequest request,
 
   private void replyError(HttpRequest request, final HttpResponse response, Exception e)
       throws Exception {
-    Renderer renderer2 = getRenderer(ResultType.EXCEPTION, request);
+    Renderer renderer2 = getRenderer(ResultType.ERROR, request);
     request.setAttribute("exception",  e);
     renderer2.render(request, response, null);
   }

diff --git a/java/server/src/org/openqa/selenium/remote/server/rest/ResultType.java b/java/server/src/org/openqa/selenium/remote/server/rest/ResultType.java
@@ -17,8 +17,6 @@
 package org.openqa.selenium.remote.server.rest;
 
 public enum ResultType {
-
   SUCCESS,
-  ERROR,
-  EXCEPTION,
+  ERROR
 }
diff --git a/java/server/test/org/openqa/selenium/remote/server/rest/ResultConfigTest.java b/java/server/test/org/openqa/selenium/remote/server/rest/ResultConfigTest.java
@@ -129,7 +129,7 @@ public void testFailsWhenUnableToDetermineResultTypeForRequest_noHandlersRegiste
     final HttpRequest mockRequest = mock(HttpRequest.class);
 
     try {
-      config.getRenderer(ResultType.EXCEPTION, mockRequest);
+      config.getRenderer(ResultType.ERROR, mockRequest);
       fail("Should have thrown a NPE");
     } catch (NullPointerException expected) {
     }