crabapples
/
Sentinel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve default block fallback logic in Dubbo 2.6.x adapter to avoid serialization problem (#1794) 

- convert BlockException to a simple RuntimeException (with necessary message)
This commit is contained in:
王振广 2020-10-30 22:15:24 +08:00 committed by GitHub
parent d510eb6cd3
commit 9936b4da60
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sentinel-adapter/sentinel-dubbo-adapter/src/main/java/com/alibaba/csp/sentinel/adapter/dubbo/fallback/DefaultDubboFallback.java
View File

@ -29,7 +29,9 @@ public class DefaultDubboFallback implements DubboFallback {
@Override @Override
public Result handle(Invoker<?> invoker, Invocation invocation, BlockException ex) { public Result handle(Invoker<?> invoker, Invocation invocation, BlockException ex) {
// Just wrap the exception. // Just wrap the exception. edit by wzg923 2020/9/23
return new RpcResult(new SentinelRpcException(ex)); RpcResult result = new RpcResult();
result.setException(new SentinelRpcException(ex.toRuntimeException()));
return result;
} }
} }

1
sentinel-adapter/sentinel-dubbo-adapter/src/test/java/com/alibaba/csp/sentinel/adapter/dubbo/fallback/DubboFallbackRegistryTest.java
View File

@ -23,7 +23,6 @@ import com.alibaba.dubbo.rpc.Invocation;
import com.alibaba.dubbo.rpc.Invoker; import com.alibaba.dubbo.rpc.Invoker;
import com.alibaba.dubbo.rpc.Result; import com.alibaba.dubbo.rpc.Result;
import com.alibaba.dubbo.rpc.RpcResult; import com.alibaba.dubbo.rpc.RpcResult;
import org.junit.Assert; import org.junit.Assert;
import org.junit.Test; import org.junit.Test;