natas_hw
/
dubbo
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

DUBBO-39 增加hessian异常code的测试 

git-svn-id: http://code.alibabatech.com/svn/dubbo/trunk@272 1a56cb94-b969-4eaa-88fa-be21384802f2
This commit is contained in:
william.liangf 2011-11-15 05:27:59 +00:00
parent 81ad2786ac
commit 8417bd2152
2 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
dubbo-rpc-hessian/src/main/java/com/alibaba/dubbo/rpc/protocol/hessian/HessianRpcInvoker.java
View File

@ -15,6 +15,8 @@
*/
package com.alibaba.dubbo.rpc.protocol.hessian;
import java.net.SocketTimeoutException;
import com.alibaba.dubbo.common.Constants;
import com.alibaba.dubbo.common.URL;
import com.alibaba.dubbo.rpc.Invocation;
@ -25,8 +27,10 @@ import com.alibaba.dubbo.rpc.RpcException;
import com.alibaba.dubbo.rpc.RpcResult;
import com.alibaba.dubbo.rpc.protocol.AbstractInvoker;
import com.caucho.hessian.HessianException;
import com.caucho.hessian.client.HessianConnectionException;
import com.caucho.hessian.client.HessianConnectionFactory;
import com.caucho.hessian.client.HessianProxyFactory;
import com.caucho.hessian.io.HessianMethodSerializationException;
/**
* hessian rpc invoker.
@ -65,16 +69,37 @@ public class HessianRpcInvoker<T> extends AbstractInvoker<T> {
if (e != null) {
String name = e.getClass().getName();
if (name.startsWith(HESSIAN_EXCEPTION_PREFIX)) {
throw new RpcException("Failed to invoke remote service: " + getInterface() + ", method: "
RpcException re = new RpcException("Failed to invoke remote service: " + getInterface() + ", method: "
+ invocation.getMethodName() + ", cause: " + e.getMessage(), e);
throw setRpcExceptionCode(e, re);
}
}
return result;
} catch (RpcException e) {
throw e;
throw setRpcExceptionCode(e.getCause(), e);
} catch (HessianException e) {
throw setRpcExceptionCode(e, new RpcException("Failed to invoke remote service: " + getInterface() + ", method: "
+ invocation.getMethodName() + ", cause: " + e.getMessage(), e));
} catch (Throwable e) {
return new RpcResult(e);
}
}
private RpcException setRpcExceptionCode(Throwable e, RpcException re) {
if (e != null) {
if (e instanceof HessianConnectionException) {
re.setCode(RpcException.NETWORK_EXCEPTION);
if (e.getCause() != null) {
Class<?> cls = e.getCause().getClass();
if (SocketTimeoutException.class.equals(cls)) {
re.setCode(RpcException.TIMEOUT_EXCEPTION);
}
}
} else if (e instanceof HessianMethodSerializationException) {
re.setCode(RpcException.SERIALIZATION_EXCEPTION);
}
}
return re;
}
}

3
dubbo-rpc-hessian/src/test/java/com/alibaba/dubbo/rpc/protocol/hessian/HessianProtocolTest.java
View File

@ -80,9 +80,10 @@ public class HessianProtocolTest {
Invoker<HessianService> invoker = protocol.refer(HessianService.class, url);
HessianService client = proxyFactory.getProxy(invoker);
try {
client.timeOut(100000);
client.timeOut(6000);
fail();
} catch (RpcException expected) {
Assert.assertEquals(true, expected.isTimeout());
}finally{
invoker.destroy();
exporter.unexport();