Polish apache#3275 : ReferenceBeanInvocationHandler does not throw th…

…e actual exception
mercyblitz · Feb 22, 2019 · 31ecb9d · 31ecb9d
1 parent cb8ad13
commit 31ecb9d
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 7 deletions.
diff --git a/...ba/dubbo/config/spring/beans/factory/annotation/ReferenceAnnotationBeanPostProcessor.java b/...ba/dubbo/config/spring/beans/factory/annotation/ReferenceAnnotationBeanPostProcessor.java
@@ -32,6 +32,7 @@
 
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.lang.reflect.Proxy;
 import java.util.Collection;
@@ -155,7 +156,14 @@ private ReferenceBeanInvocationHandler(ReferenceBean referenceBean) {
 
         @Override
         public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
-            return method.invoke(bean, args);
+            Object result = null;
+            try {
+                result = method.invoke(bean, args);
+            } catch (InvocationTargetException e) {
+                // re-throws the actual Exception.
+                throw e.getTargetException();
+            }
+            return result;
         }
 
         private void init() {

diff --git a/...a/com/alibaba/dubbo/config/spring/context/annotation/DubboComponentScanRegistrarTest.java b/...a/com/alibaba/dubbo/config/spring/context/annotation/DubboComponentScanRegistrarTest.java
@@ -111,5 +111,31 @@ public void test() {
 
     }
 
+    @Test(expected = UnsupportedOperationException.class)
+    public void testOnException() {
+
+        AnnotationConfigApplicationContext providerContext = new AnnotationConfigApplicationContext();
+
+        providerContext.register(ProviderConfiguration.class);
+
+        providerContext.refresh();
+
+        AnnotationConfigApplicationContext consumerContext = new AnnotationConfigApplicationContext();
+
+        consumerContext.register(ConsumerConfiguration.class);
+
+        consumerContext.refresh();
+
+        ConsumerConfiguration.Child child = consumerContext.getBean(ConsumerConfiguration.Child.class);
+
+        // From Child
+        DemoService demoService = child.getDemoServiceFromChild();
+
+        demoService.getBox();
+
+        providerContext.close();
+        consumerContext.close();
+    }
+
 
 }
diff --git a/...est/java/com/alibaba/dubbo/config/spring/context/annotation/provider/DemoServiceImpl.java b/...est/java/com/alibaba/dubbo/config/spring/context/annotation/provider/DemoServiceImpl.java
@@ -45,11 +45,6 @@ public String sayName(String name) {
 
     @Override
     public Box getBox() {
-        return new Box() {
-            @Override
-            public String getName() {
-                return "MyBox";
-            }
-        };
+        throw new UnsupportedOperationException("For Purposes!");
     }
 }