Fixed BulkheadAspect: An ExecutionException is wrapped by a Completio…

…nException, but instead the cause should be wrapped. (ReactiveX#841) Fixed FixedThreadPoolBulkhead: A CompletionException should not be wrapped inside of another CompletionException.
jihoonson · Feb 4, 2020 · 22931ca · 22931ca
1 parent eb96750
commit 22931ca
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/...khead/src/main/java/io/github/resilience4j/bulkhead/internal/FixedThreadPoolBulkhead.java b/...khead/src/main/java/io/github/resilience4j/bulkhead/internal/FixedThreadPoolBulkhead.java
@@ -143,6 +143,9 @@ public <T> CompletableFuture<T> submit(Callable<T> callable) {
                     publishBulkheadEvent(() -> new BulkheadOnCallPermittedEvent(name));
                     return callable.call();
                 } catch (Exception e) {
+                    if(e instanceof CompletionException){
+                        throw (CompletionException)e;
+                    }
                     throw new CompletionException(e);
                 }
             }), executorService).whenComplete((result, throwable) -> {

diff --git a/...ence4j-spring/src/main/java/io/github/resilience4j/bulkhead/configure/BulkheadAspect.java b/...ence4j-spring/src/main/java/io/github/resilience4j/bulkhead/configure/BulkheadAspect.java
@@ -43,6 +43,7 @@
 import java.util.List;
 import java.util.concurrent.CompletionException;
 import java.util.concurrent.CompletionStage;
+import java.util.concurrent.ExecutionException;
 
 /**
  * This Spring AOP aspect intercepts all methods which are annotated with a {@link Bulkhead}
@@ -249,8 +250,10 @@ private Object proceedInThreadPoolBulkhead(ProceedingJoinPoint proceedingJoinPoi
                 try {
                     return ((CompletionStage<?>) proceedingJoinPoint.proceed())
                         .toCompletableFuture().get();
-                } catch (Throwable throwable) {
-                    throw new CompletionException(throwable);
+                } catch (ExecutionException e) {
+                    throw new CompletionException(e.getCause());
+                } catch (Throwable e) {
+                    throw new CompletionException(e);
                 }
             });
         } else {