study/Spring-Cloud-Alibaba
1
0
Fork 0
mirror of https://gitee.com/mirrors/Spring-Cloud-Alibaba.git synced 2021-06-26 13:25:11 +08:00
Code Issues Releases Wiki Activity

fixes #151

Browse Source
This commit is contained in:
fangjian0423 2018-12-11 17:08:13 +08:00
parent de0059359f
commit 62c0326090
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/feign/SentinelFeign.java
View File

@ -89,13 +89,14 @@ public class SentinelFeign {
// check fallback and fallbackFactory properties // check fallback and fallbackFactory properties
if (void.class != fallback) { if (void.class != fallback) {
fallbackInstance = getFromContext(name, "fallback", fallback, fallbackInstance = getFromContext(name, "fallback", fallback,
target); target.type());
return new SentinelInvocationHandler(target, dispatch, return new SentinelInvocationHandler(target, dispatch,
new FallbackFactory.Default(fallbackInstance)); new FallbackFactory.Default(fallbackInstance));
} }
if (void.class != fallbackFactory) { if (void.class != fallbackFactory) {
fallbackFactoryInstance = (FallbackFactory) getFromContext(name, fallbackFactoryInstance = (FallbackFactory) getFromContext(name,
"fallbackFactory", fallbackFactory, target); "fallbackFactory", fallbackFactory,
FallbackFactory.class);
return new SentinelInvocationHandler(target, dispatch, return new SentinelInvocationHandler(target, dispatch,
fallbackFactoryInstance); fallbackFactoryInstance);
} }
@ -103,7 +104,7 @@ public class SentinelFeign {
} }
private Object getFromContext(String name, String type, private Object getFromContext(String name, String type,
Class fallbackType, Target target) { Class fallbackType, Class targetType) {
Object fallbackInstance = feignContext.getInstance(name, Object fallbackInstance = feignContext.getInstance(name,
fallbackType); fallbackType);
if (fallbackInstance == null) { if (fallbackInstance == null) {
@ -112,10 +113,10 @@ public class SentinelFeign {
type, fallbackType, name)); type, fallbackType, name));
} }
if (!target.type().isAssignableFrom(fallbackType)) { if (!targetType.isAssignableFrom(fallbackType)) {
throw new IllegalStateException(String.format( throw new IllegalStateException(String.format(
"Incompatible %s instance. Fallback/fallbackFactory of type %s is not assignable to %s for feign client %s", "Incompatible %s instance. Fallback/fallbackFactory of type %s is not assignable to %s for feign client %s",
type, fallbackType, target.type(), name)); type, fallbackType, targetType, name));
} }
return fallbackInstance; return fallbackInstance;
} }