Author: thomas.diesler(a)jboss.com Date: 2007-08-14 06:09:19 -0400 (Tue, 14 Aug 2007) New Revision: 4356 Modified: stack/native/branches/native-2.0/.classpath stack/native/branches/native-2.0/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java Log: [JBWS-1670] SunRI client does not throw UserException. Do not unwrap InvocationTargetException Modified: stack/native/branches/native-2.0/.classpath =================================================================== --- stack/native/branches/native-2.0/.classpath 2007-08-14 10:04:06 UTC (rev 4355) +++ stack/native/branches/native-2.0/.classpath 2007-08-14 10:09:19 UTC (rev 4356) @@ -10,7 +10,6 @@ <classpathentry kind="lib" path="thirdparty/jaxb-api.jar"/> <classpathentry kind="lib" path="thirdparty/jaxb-impl.jar"/> <classpathentry kind="lib" path="thirdparty/jaxb-xjc.jar"/> - <classpathentry kind="lib" path="thirdparty/jboss-common-core.jar"/> <classpathentry kind="lib" path="thirdparty/jboss-dependency.jar"/> <classpathentry kind="lib" path="thirdparty/jboss-j2ee.jar"/> <classpathentry kind="lib" path="thirdparty/jboss-logging-spi.jar"/> @@ -37,7 +36,8 @@ <classpathentry kind="lib" path="thirdparty/concurrent.jar"/> <classpathentry kind="lib" path="thirdparty/junit.jar"/> <classpathentry kind="lib" path="thirdparty/jbossws-common.jar" sourcepath="thirdparty/jbossws-common-src.zip"/> - <classpathentry kind="lib" path="thirdparty/jbossws-spi.jar" sourcepath="thirdparty/jbossws-spi-src.zip"/> <classpathentry kind="lib" path="thirdparty/ejb3.deployer/jboss-ejb3.jar"/> + <classpathentry combineaccessrules="false" kind="src" path="/common"/> + <classpathentry combineaccessrules="false" kind="src" path="/spi"/> <classpathentry kind="output" path="output/eclipse"/> </classpath> Modified: stack/native/branches/native-2.0/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java =================================================================== --- stack/native/branches/native-2.0/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java 2007-08-14 10:04:06 UTC (rev 4355) +++ stack/native/branches/native-2.0/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java 2007-08-14 10:09:19 UTC (rev 4356) @@ -23,7 +23,9 @@ // $Id$ +import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; +import java.lang.reflect.UndeclaredThrowableException; import java.util.HashMap; import javax.activation.DataHandler; @@ -212,7 +214,17 @@ // Invoke an instance of the SEI implementation bean Invocation inv = setupInvocation(endpoint, sepInv, invContext); InvocationHandler invHandler = endpoint.getInvocationHandler(); - invHandler.invoke(endpoint, inv); + + try + { + invHandler.invoke(endpoint, inv); + } + catch (InvocationTargetException th) + { + // Unwrap the throwable raised by the service endpoint implementation + Throwable targetEx = ((InvocationTargetException)th).getTargetException(); + throw (targetEx instanceof Exception ? (Exception)targetEx : new UndeclaredThrowableException(targetEx)); + } // Handler processing might have replaced the endpoint invocation sepInv = inv.getInvocationContext().getAttachment(EndpointInvocation.class);