[jbossws-commits] JBossWS SVN: r1942 - in branches/tdiesler/trunk: jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1410 and 1 other directory.

[jbossws-commits at lists.jboss.org]

Author: thomas.diesler at jboss.com
Date: 2007-01-12 07:38:06 -0500 (Fri, 12 Jan 2007)
New Revision: 1942

Modified:
   branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/CallImpl.java
   branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1410/JBWS1410TestCase.java
Log:
Propagate WSTimeoutException to client

Modified: branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/CallImpl.java
===================================================================
--- branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/CallImpl.java	2007-01-12 12:20:33 UTC (rev 1941)
+++ branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/CallImpl.java	2007-01-12 12:38:06 UTC (rev 1942)
@@ -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: branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1410/JBWS1410TestCase.java
===================================================================
--- branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1410/JBWS1410TestCase.java	2007-01-12 12:20:33 UTC (rev 1941)
+++ branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1410/JBWS1410TestCase.java	2007-01-12 12:38:06 UTC (rev 1942)
@@ -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());
       }
    }
 }