[jbossws-commits] JBossWS SVN: r5553 - in stack/native/trunk/src: test/java/org/jboss/test/ws/jaxws/wsrm/oneway and 1 other directories.

[jbossws-commits at lists.jboss.org]

Author: richard.opalka at jboss.com
Date: 2008-01-31 04:40:57 -0500 (Thu, 31 Jan 2008)
New Revision: 5553

Modified:
   stack/native/trunk/src/main/java/org/jboss/ws/core/jaxws/client/ClientProxy.java
   stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/oneway/RMAbstractOneWayTest.java
   stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/oneway/RMAbstractSecuredOneWayTest.java
   stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/reqres/RMAbstractReqResTest.java
   stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/reqres/RMAbstractSecuredReqResTest.java
Log:
[JBWS-1777] fixed

Modified: stack/native/trunk/src/main/java/org/jboss/ws/core/jaxws/client/ClientProxy.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/core/jaxws/client/ClientProxy.java	2008-01-30 19:03:40 UTC (rev 5552)
+++ stack/native/trunk/src/main/java/org/jboss/ws/core/jaxws/client/ClientProxy.java	2008-01-31 09:40:57 UTC (rev 5553)
@@ -163,6 +163,12 @@
 
    private Object invoke(QName opName, Object[] args, Class retType, Map<String, Object> resContext) throws RemoteException
    {
+      boolean rmDetected = this.client.getEndpointMetaData().getConfig().getRMMetaData() != null;
+      boolean rmActivated = client.getWSRMSequence() != null;
+      if (rmDetected && !rmActivated)
+      {
+         client.createSequence();
+      }
       Object retObj = client.invoke(opName, args, resContext);
       if (retObj != null)
       {

Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/oneway/RMAbstractOneWayTest.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/oneway/RMAbstractOneWayTest.java	2008-01-30 19:03:40 UTC (rev 5552)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/oneway/RMAbstractOneWayTest.java	2008-01-31 09:40:57 UTC (rev 5553)
@@ -59,14 +59,13 @@
    
    public void testOneWayMethods() throws Exception
    {
-      ((RMProvider)proxy).createSequence();
       setAddrProps(proxy, "http://useless/action1", serviceURL);
       proxy.method1();
       setAddrProps(proxy, "http://useless/action2", serviceURL);
       proxy.method2("Hello World");
       setAddrProps(proxy, "http://useless/action3", serviceURL);
       proxy.method3(new String[] {"Hello","World"});
-      ((RMProvider)proxy).closeSequence();
+      ((RMProvider)proxy).closeSequence(); // this is optional operation
    }
 
    public static String getClasspath()

Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/oneway/RMAbstractSecuredOneWayTest.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/oneway/RMAbstractSecuredOneWayTest.java	2008-01-30 19:03:40 UTC (rev 5552)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/oneway/RMAbstractSecuredOneWayTest.java	2008-01-31 09:40:57 UTC (rev 5553)
@@ -59,14 +59,13 @@
    
    public void testOneWayMethods() throws Exception
    {
-      ((RMProvider)proxy).createSequence();
       setAddrProps(proxy, "http://useless/action1", serviceURL);
       proxy.method1();
       setAddrProps(proxy, "http://useless/action2", serviceURL);
       proxy.method2("Hello World");
       setAddrProps(proxy, "http://useless/action3", serviceURL);
       proxy.method3(new String[] {"Hello","World"});
-      ((RMProvider)proxy).closeSequence();
+      ((RMProvider)proxy).closeSequence(); // this is optional operation
    }
 
    public static String getClasspath()

Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/reqres/RMAbstractReqResTest.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/reqres/RMAbstractReqResTest.java	2008-01-30 19:03:40 UTC (rev 5552)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/reqres/RMAbstractReqResTest.java	2008-01-31 09:40:57 UTC (rev 5553)
@@ -151,14 +151,13 @@
    
    private void doReliableMessageExchange(Object proxyObject, InvocationType invocationType) throws Exception
    {
-      ((RMProvider)proxyObject).createSequence();
       setAddrProps(proxy, "http://useless/action", serviceURL);
       invokeWebServiceMethod(invocationType);
       setAddrProps(proxy, "http://useless/action", serviceURL);
       invokeWebServiceMethod(invocationType);
       setAddrProps(proxy, "http://useless/action", serviceURL);
       invokeWebServiceMethod(invocationType);
-      ((RMProvider)proxyObject).closeSequence();
+      ((RMProvider)proxyObject).closeSequence(); // this is optional operation
    }
    
    public static String getClasspath()

Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/reqres/RMAbstractSecuredReqResTest.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/reqres/RMAbstractSecuredReqResTest.java	2008-01-30 19:03:40 UTC (rev 5552)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/reqres/RMAbstractSecuredReqResTest.java	2008-01-31 09:40:57 UTC (rev 5553)
@@ -150,14 +150,13 @@
    
    private void doReliableMessageExchange(Object proxyObject, InvocationType invocationType) throws Exception
    {
-      ((RMProvider)proxyObject).createSequence();
       setAddrProps(proxy, "http://useless/action", serviceURL);
       invokeWebServiceMethod(invocationType);
       setAddrProps(proxy, "http://useless/action", serviceURL);
       invokeWebServiceMethod(invocationType);
       setAddrProps(proxy, "http://useless/action", serviceURL);
       invokeWebServiceMethod(invocationType);
-      ((RMProvider)proxyObject).closeSequence();
+      ((RMProvider)proxyObject).closeSequence(); // this is optional operation
    }
    
    public static String getClasspath()