Fix consumer exception missing when void method from provider is call…

…ed with exception.
huangzixun · Jun 28, 2018 · 8a8fff4 · 8a8fff4
1 parent 42e63bd
commit 8a8fff4
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 6 deletions.
diff --git a/core-impl/proxy/src/main/java/com/alipay/sofa/rpc/proxy/javassist/JavassistProxy.java b/core-impl/proxy/src/main/java/com/alipay/sofa/rpc/proxy/javassist/JavassistProxy.java
@@ -189,18 +189,19 @@ private void createMethod(Class<?> interfaceClass, List<String> fieldList, List<
                 ".SERVER_UNDECLARED_ERROR," + " response.getErrorMsg());");
             sb.append("}");
 
+            sb.append("Object ret = response.getAppResponse();");
+            sb.append("if (ret instanceof Throwable) {");
+            sb.append("    throw (Throwable) ret;");
+            sb.append("} else {");
             if (returnType.equals(void.class)) {
                 sb.append(" return;");
             } else {
-                sb.append("Object ret = response.getAppResponse();");
-                sb.append("if (ret instanceof Throwable) {");
-                sb.append("    throw (Throwable) ret;");
-                sb.append("} else {");
-                sb.append("    return " + asArgument(returnType, "ret") + ";");
-                sb.append("}");
+                sb.append(" return " + asArgument(returnType, "ret") + ";");
             }
+            sb.append("}");
 
             sb.append("}");
+
             resultList.add(sb.toString());
             sb.delete(0, sb.length());
         }

diff --git a/...t-integration/src/test/java/com/alipay/sofa/rpc/test/exception/BizThrowExceptionTest.java b/...t-integration/src/test/java/com/alipay/sofa/rpc/test/exception/BizThrowExceptionTest.java
@@ -83,5 +83,12 @@ public void testAll() {
             Assert.assertTrue(e instanceof TestException);
             Assert.assertEquals(e.getMessage(), "TestException");
         }
+
+        try {
+            service.throwDeclaredExceptionWithoutReturn();
+        } catch (Throwable e) {
+            Assert.assertTrue(e instanceof TestException);
+            Assert.assertEquals(e.getMessage(), "DeclaredExceptionWithoutReturn");
+        }
     }
 }
diff --git a/...st-integration/src/test/java/com/alipay/sofa/rpc/test/exception/TestExceptionService.java b/...st-integration/src/test/java/com/alipay/sofa/rpc/test/exception/TestExceptionService.java
@@ -32,4 +32,6 @@ public interface TestExceptionService {
     public String throwSofaException() throws SofaRpcException;
 
     public String throwDeclaredException() throws TestException;
+
+    public void throwDeclaredExceptionWithoutReturn() throws TestException;
 }
diff --git a/...ntegration/src/test/java/com/alipay/sofa/rpc/test/exception/TestExceptionServiceImpl.java b/...ntegration/src/test/java/com/alipay/sofa/rpc/test/exception/TestExceptionServiceImpl.java
@@ -43,4 +43,9 @@ public String throwSofaException() throws SofaRpcException {
     public String throwDeclaredException() throws TestException {
         throw new TestException("TestException");
     }
+
+    @Override
+    public void throwDeclaredExceptionWithoutReturn() throws TestException {
+        throw new TestException("DeclaredExceptionWithoutReturn");
+    }
 }