commit 88b51ef4cbd45eabbf47b6e62a3b2eabd5080bc4
author Christian Schneider <chris@die-schneider.net> Tue Jul 11 11:32:15 2017 +0200
committer Christian Schneider <chris@die-schneider.net> Tue Jul 11 11:32:15 2017 +0200
tree de84fef7b987c69122e7e73aeb1766913abee043
parent 97873bb00d3fd3343351368d4a95f23992b2cee4

[DOSGI-254] Fix handling of inherited exceptions

common/src/main/java/org/apache/cxf/dosgi/common/proxy/ExceptionMapper.java

diff --git a/common/src/main/java/org/apache/cxf/dosgi/common/proxy/ExceptionMapper.java b/common/src/main/java/org/apache/cxf/dosgi/common/proxy/ExceptionMapper.java
index 77c72b2..2e3044b 100644
--- a/common/src/main/java/org/apache/cxf/dosgi/common/proxy/ExceptionMapper.java
+++ b/common/src/main/java/org/apache/cxf/dosgi/common/proxy/ExceptionMapper.java
@@ -54,6 +54,9 @@
         for (Method m : iType.getDeclaredMethods()) {
             addExceptions(m);
         }
+        for (Method m : iType.getMethods()) {
+            addExceptions(m);
+        }
     }
 
     private void addExceptions(Method m) {

common/src/test/java/org/apache/cxf/dosgi/common/proxy/ServiceInvocationHandlerTest.java

diff --git a/common/src/test/java/org/apache/cxf/dosgi/common/proxy/ServiceInvocationHandlerTest.java b/common/src/test/java/org/apache/cxf/dosgi/common/proxy/ServiceInvocationHandlerTest.java
index 43a90a7..af31b4d 100644
--- a/common/src/test/java/org/apache/cxf/dosgi/common/proxy/ServiceInvocationHandlerTest.java
+++ b/common/src/test/java/org/apache/cxf/dosgi/common/proxy/ServiceInvocationHandlerTest.java
@@ -30,7 +30,6 @@
 import java.util.Map;
 
 import org.junit.Test;
-import org.osgi.framework.ServiceException;
 
 public class ServiceInvocationHandlerTest {
 
@@ -84,11 +83,7 @@
         proxy.throwException2();
     }
     
-    /**
-     * Shows issue https://issues.apache.org/jira/projects/DOSGI/issues/DOSGI-254
-     * We would expect an IOexcpetion here
-     */
-    @Test(expected = ServiceException.class)
+    @Test(expected = IOException.class)
     public void testInheritedException() throws IOException {
         MySubService proxy = ProxyFactory.create(new MyServiceImpl(), MySubService.class);
         proxy.throwException1();