+ create the exception once

Netflix · May 19, 2014 · 7021050 · 7021050
1 parent ed14752
commit 7021050
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/...-core/src/main/java/com/netflix/hystrix/collapser/CollapsedRequestObservableFunction.java b/...-core/src/main/java/com/netflix/hystrix/collapser/CollapsedRequestObservableFunction.java
@@ -102,17 +102,21 @@ public void setExceptionIfResponseNotReceived(Exception e) {
     /**
      * Set an ISE if a response is not yet received otherwise skip it
      *
+     * @param e A pre-generated exception.  If this is null an ISE will be created and returned
      * @param exceptionMessage The message for the ISE
      */
-    public void setIllegalStateExceptionIfResponseNotReceived(String exceptionMessage) {
+    public Exception setExceptionIfResponseNotReceived(Exception e, String exceptionMessage) {
+        Exception exception = e;
         CollapsedRequestObservableFunction.ResponseHolder<T> r = rh.get();
         // only proceed if neither response is set
         if (!r.isResponseSet() && r.getException() == null) {
-            setExceptionIfResponseNotReceived(new IllegalStateException(exceptionMessage));
-        } else {
-            // return quietly instead of throwing an exception
-            return;
+            if(e==null) {
+                exception = new IllegalStateException(exceptionMessage);
+            }
+            setExceptionIfResponseNotReceived(exception);
         }
+        // return any exception that was generated
+        return exception;
     }
 
     /**

diff --git a/hystrix-core/src/main/java/com/netflix/hystrix/collapser/RequestBatch.java b/hystrix-core/src/main/java/com/netflix/hystrix/collapser/RequestBatch.java
@@ -143,9 +143,10 @@ public void call(Throwable e) {
                             @Override
                             public void call() {
                                 // check that all requests had setResponse or setException invoked in case 'mapResponseToRequests' was implemented poorly
+                                Exception e = null;
                                 for (CollapsedRequest<ResponseType, RequestArgumentType> request : shardRequests) {
                                     try {
-                                        ((CollapsedRequestObservableFunction<ResponseType, RequestArgumentType>) request).setIllegalStateExceptionIfResponseNotReceived("No response set by " + commandCollapser.getCollapserKey().name() + " 'mapResponseToRequests' implementation.");
+                                       e = ((CollapsedRequestObservableFunction<ResponseType, RequestArgumentType>) request).setExceptionIfResponseNotReceived(e,"No response set by " + commandCollapser.getCollapserKey().name() + " 'mapResponseToRequests' implementation.");
                                     } catch (IllegalStateException e2) {
                                         logger.debug("Partial success of 'mapResponseToRequests' resulted in IllegalStateException while setting 'No response set' Exception. Continuing ... ", e2);
                                     }