[PAXCDI-192] Unwrap exceptions in proxy invocation handlers

Author: hwellmann

pax-cdi-extension/src/main/java/org/ops4j/pax/cdi/extension/impl/client/DynamicInvocationHandler.java

@@ -17,6 +17,7 @@
  */
 package org.ops4j.pax.cdi.extension.impl.client;
 
+import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.concurrent.Callable;
 
@@ -25,6 +26,7 @@
 import org.ops4j.pax.cdi.extension.impl.compat.OsgiScopeUtils;
 import org.ops4j.pax.cdi.extension.impl.compat.ServiceObjectsWrapper;
 import org.ops4j.pax.cdi.extension.impl.util.InjectionPointOsgiUtils;
+import org.ops4j.pax.cdi.spi.util.Exceptions;
 import org.ops4j.pax.swissbox.core.ContextClassLoaderUtils;
 import org.osgi.framework.ServiceReference;
 
@@ -64,7 +66,12 @@ public Object invoke(Object proxy, final Method method, final Object[] args) thr
 
                 @Override
                 public Object call() throws Exception {
-                    return method.invoke(service, args);
+                    try {
+                        return method.invoke(service, args);
+                    }
+                    catch (InvocationTargetException exc) {
+                        throw Exceptions.unchecked(exc.getCause());
+                    }
                 }
             });
         serviceObjects.ungetService(service);

pax-cdi-extension/src/main/java/org/ops4j/pax/cdi/extension/impl/client/StaticInvocationHandler.java

@@ -17,6 +17,7 @@
  */
 package org.ops4j.pax.cdi.extension.impl.client;
 
+import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.concurrent.Callable;
 
@@ -25,6 +26,7 @@
 import org.ops4j.pax.cdi.extension.impl.compat.OsgiScopeUtils;
 import org.ops4j.pax.cdi.extension.impl.compat.ServiceObjectsWrapper;
 import org.ops4j.pax.cdi.extension.impl.util.InjectionPointOsgiUtils;
+import org.ops4j.pax.cdi.spi.util.Exceptions;
 import org.ops4j.pax.swissbox.core.ContextClassLoaderUtils;
 import org.osgi.framework.ServiceException;
 import org.osgi.framework.ServiceReference;
@@ -71,7 +73,12 @@ public Object invoke(Object proxy, final Method method, final Object[] args) thr
                     @Override
                     public Object call() throws Exception {
                         if (service != null) {
-                            return method.invoke(service, args);
+                            try {
+                                return method.invoke(service, args);
+                            }
+                            catch (InvocationTargetException exc) {
+                                throw Exceptions.unchecked(exc.getCause());
+                            }
                         }
                         return null;
                     }

pax-cdi-spi/src/main/java/org/ops4j/pax/cdi/spi/util/Exceptions.java

@@ -55,13 +55,13 @@ private Exceptions() {
      *            checked exception
      * @return syntactically, a runtime exception (but never actually returns)
      */
-    public static RuntimeException unchecked(Exception exc) {
+    public static RuntimeException unchecked(Throwable exc) {
         Exceptions.<RuntimeException> adapt(exc);
         return null;
     }
 
     @SuppressWarnings("unchecked")
-    private static <T extends Exception> void adapt(Exception exc) throws T {
+    private static <T extends Exception> void adapt(Throwable exc) throws T {
         throw (T) exc;
     }
 }