Merge 207ac5d into e79bb10

sofastack · Aug 28, 2018 · f58964b · f58964b
2 parents e79bb10 + 207ac5d
commit f58964b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/...rc/main/java/com/alipay/sofa/runtime/integration/invoke/DynamicJvmServiceProxyFinder.java b/...rc/main/java/com/alipay/sofa/runtime/integration/invoke/DynamicJvmServiceProxyFinder.java
@@ -36,6 +36,7 @@
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.Collection;
 
@@ -167,6 +168,8 @@ protected Object doInvoke(MethodInvocation invocation) throws Throwable {
                 Object retVal = transformMethod.invoke(targetService, arguments);
 
                 return hessianTransport(retVal, getClientClassloader());
+            } catch (InvocationTargetException ex) {
+                throw ex.getTargetException();
             } finally {
                 setClientClassloader(null);
             }

diff --git a/...boot-starter/src/main/java/com/alipay/sofa/runtime/service/binding/JvmBindingAdapter.java b/...boot-starter/src/main/java/com/alipay/sofa/runtime/service/binding/JvmBindingAdapter.java
@@ -124,7 +124,7 @@ private Object createServiceProxy(Contract contract, JvmBinding binding,
                 factory.setProxyTargetClass(true);
             }
             factory.addAdvice(handler);
-            return factory.getProxy();
+            return factory.getProxy(newClassLoader);
         } finally {
             Thread.currentThread().setContextClassLoader(oldClassLoader);
         }