Replaces getFailedExecutionException() on getExecutionException() for fallback factory

zhurpavel · adriancole · commit 9a859da4ced6 · 2016-11-08T10:36:34.000-08:00
Fixes OpenFeign#464
diff --git a/hystrix/src/main/java/feign/hystrix/FallbackFactory.java b/hystrix/src/main/java/feign/hystrix/FallbackFactory.java
@@ -33,7 +33,7 @@ public interface FallbackFactory<T> {
   /**
    * Returns an instance of the fallback appropriate for the given cause
    *
-   * @param cause corresponds to {@link com.netflix.hystrix.AbstractCommand#getFailedExecutionException()}
+   * @param cause corresponds to {@link com.netflix.hystrix.AbstractCommand#getExecutionException()}
    * often, but not always an instance of {@link FeignException}.
    */
   T create(Throwable cause);
diff --git a/hystrix/src/main/java/feign/hystrix/HystrixInvocationHandler.java b/hystrix/src/main/java/feign/hystrix/HystrixInvocationHandler.java
@@ -119,7 +119,7 @@ protected Object getFallback() {
           return super.getFallback();
         }
         try {
-          Object fallback = fallbackFactory.create(getFailedExecutionException());
+          Object fallback = fallbackFactory.create(getExecutionException());
           Object result = fallbackMethodMap.get(method).invoke(fallback, args);
           if (isReturnsHystrixCommand(method)) {
             return ((HystrixCommand) result).execute();

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ public interface FallbackFactory<T> {`
`33`	`33`	`/**`
`34`	`34`	`* Returns an instance of the fallback appropriate for the given cause`
`35`	`35`	`*`
`36`		`- * @param cause corresponds to {@link com.netflix.hystrix.AbstractCommand#getFailedExecutionException()}`
	`36`	`+ * @param cause corresponds to {@link com.netflix.hystrix.AbstractCommand#getExecutionException()}`
`37`	`37`	`* often, but not always an instance of {@link FeignException}.`
`38`	`38`	`*/`
`39`	`39`	`T create(Throwable cause);`
Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,7 @@ protected Object getFallback() {`
`119`	`119`	`return super.getFallback();`
`120`	`120`	`}`
`121`	`121`	`try {`
`122`		`- Object fallback = fallbackFactory.create(getFailedExecutionException());`
	`122`	`+ Object fallback = fallbackFactory.create(getExecutionException());`
`123`	`123`	`Object result = fallbackMethodMap.get(method).invoke(fallback, args);`
`124`	`124`	`if (isReturnsHystrixCommand(method)) {`
`125`	`125`	`return ((HystrixCommand) result).execute();`