[jbossws-commits] JBossWS SVN: r1944 - in trunk: jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1410 and 1 other directory.
Author: thomas.diesler(a)jboss.com
Date: 2007-01-12 07:50:18 -0500 (Fri, 12 Jan 2007)
New Revision: 1944
Modified:
trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/CallImpl.java
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1410/JBWS1410TestCase.java
Log:
Propagate WSTimeoutException to client
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/CallImpl.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/CallImpl.java 2007-01-12
12:48:02 UTC (rev 1943)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/CallImpl.java 2007-01-12
12:50:18 UTC (rev 1944)
@@ -51,6 +51,7 @@
import org.jboss.ws.Constants;
import org.jboss.ws.core.CommonClient;
import org.jboss.ws.core.CommonMessageContext;
+import org.jboss.ws.core.WSTimeoutException;
import org.jboss.ws.core.jaxrpc.binding.JBossXBDeserializerFactory;
import org.jboss.ws.core.jaxrpc.binding.JBossXBSerializerFactory;
import org.jboss.ws.core.jaxrpc.handler.HandlerChainBaseImpl;
@@ -616,6 +617,10 @@
{
throw rex;
}
+ catch (WSTimeoutException toex)
+ {
+ throw toex;
+ }
catch (Exception ex)
{
throw new RemoteException("Call invocation failed", ex);
Modified:
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1410/JBWS1410TestCase.java
===================================================================
---
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1410/JBWS1410TestCase.java 2007-01-12
12:48:02 UTC (rev 1943)
+++
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1410/JBWS1410TestCase.java 2007-01-12
12:50:18 UTC (rev 1944)
@@ -23,7 +23,6 @@
import java.io.File;
import java.net.URL;
-import java.rmi.RemoteException;
import javax.xml.namespace.QName;
import javax.xml.rpc.Service;
@@ -34,7 +33,6 @@
import org.jboss.test.ws.JBossWSTest;
import org.jboss.test.ws.JBossWSTestSetup;
-import org.jboss.ws.WSException;
import org.jboss.ws.core.WSTimeoutException;
import org.jboss.ws.core.jaxrpc.ServiceFactoryImpl;
import org.jboss.ws.core.jaxrpc.StubExt;
@@ -85,11 +83,9 @@
port.echoSimple("500");
fail("socket timeout expected");
}
- catch (RemoteException ex)
+ catch (WSTimeoutException ex)
{
- assertTrue ("WSTimeoutException expected", ex.getCause() instanceof
WSTimeoutException);
- WSTimeoutException toex = (WSTimeoutException)ex.getCause();
- assertEquals(100, toex.getTimeout());
+ assertEquals(100, ex.getTimeout());
}
}
}