Merge pull request #183 from mattrjacobs/bad-request-exception-handling

Bugfix to HystrixBadRequestException handling
Netflix · Sep 27, 2013 · d5a19eb · d5a19eb
2 parents e8573a1 + e6403c4
commit d5a19eb
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/hystrix-core/src/main/java/com/netflix/hystrix/HystrixCommand.java b/hystrix-core/src/main/java/com/netflix/hystrix/HystrixCommand.java
@@ -1264,11 +1264,10 @@ private R executeCommand() {
                 if (decorated instanceof HystrixBadRequestException) {
                     e = (HystrixBadRequestException) decorated;
                 } else {
-                    logger.warn("ExecutionHook.endRunFailure returned an exception that was not an instance of HystrixBadRequestException so will be ignored.", decorated);
+                    logger.warn("ExecutionHook.onRunError returned an exception that was not an instance of HystrixBadRequestException so will be ignored.", decorated);
                 }
-                throw e;
             } catch (Exception hookException) {
-                logger.warn("Error calling ExecutionHook.endRunFailure", hookException);
+                logger.warn("Error calling ExecutionHook.onRunError", hookException);
             }
 
             /*