[jbossws-commits] JBossWS SVN: r8088 - in stack/native/branches/dlofthouse/JBWS-1862/modules: core/src/main/java/org/jboss/ws/core/jaxrpc/client and 1 other directories.

[jbossws-commits at lists.jboss.org]

Author: darran.lofthouse at jboss.com
Date: 2008-08-13 09:22:30 -0400 (Wed, 13 Aug 2008)
New Revision: 8088

Modified:
   stack/native/branches/dlofthouse/JBWS-1862/modules/core/src/main/java/org/jboss/ws/core/EndpointInvocation.java
   stack/native/branches/dlofthouse/JBWS-1862/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/client/CallImpl.java
   stack/native/branches/dlofthouse/JBWS-1862/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1862/JBWS1862TestCase.java
Log:
Further work on test scenarios.

Modified: stack/native/branches/dlofthouse/JBWS-1862/modules/core/src/main/java/org/jboss/ws/core/EndpointInvocation.java
===================================================================
--- stack/native/branches/dlofthouse/JBWS-1862/modules/core/src/main/java/org/jboss/ws/core/EndpointInvocation.java	2008-08-13 13:12:55 UTC (rev 8087)
+++ stack/native/branches/dlofthouse/JBWS-1862/modules/core/src/main/java/org/jboss/ws/core/EndpointInvocation.java	2008-08-13 13:22:30 UTC (rev 8088)
@@ -277,7 +277,8 @@
          int index = paramMetaData.getIndex();
 
          // doc/lit wrapped return headers are OUT, so skip
-         if (index < 0)
+         // Also skip other OUT params that should not be considered for inputParams
+         if (index < 0 || paramMetaData.getMode() == ParameterMode.OUT)
             continue;
 
          QName xmlName = paramMetaData.getXmlName();

Modified: stack/native/branches/dlofthouse/JBWS-1862/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/client/CallImpl.java
===================================================================
--- stack/native/branches/dlofthouse/JBWS-1862/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/client/CallImpl.java	2008-08-13 13:12:55 UTC (rev 8087)
+++ stack/native/branches/dlofthouse/JBWS-1862/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/client/CallImpl.java	2008-08-13 13:22:30 UTC (rev 8088)
@@ -212,14 +212,8 @@
       ParameterMetaData paramMetaData = new ParameterMetaData(opMetaData, xmlName, xmlType, javaType.getName());
       paramMetaData.setMode(mode);
       paramMetaData.setInHeader(inHeader);
-      if (mode == ParameterMode.IN || mode == ParameterMode.INOUT)
-      {
-         paramMetaData.setIndex(opMetaData.getInputParameters().size());
-      }
-      else
-      {
-         paramMetaData.setIndex(-1);
-      }
+      paramMetaData.setIndex(opMetaData.getParameters().size());
+
       opMetaData.addParameter(paramMetaData);
 
       registerParameterType(xmlType, javaType);

Modified: stack/native/branches/dlofthouse/JBWS-1862/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1862/JBWS1862TestCase.java
===================================================================
--- stack/native/branches/dlofthouse/JBWS-1862/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1862/JBWS1862TestCase.java	2008-08-13 13:12:55 UTC (rev 8087)
+++ stack/native/branches/dlofthouse/JBWS-1862/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1862/JBWS1862TestCase.java	2008-08-13 13:22:30 UTC (rev 8088)
@@ -28,6 +28,7 @@
 import javax.xml.rpc.ParameterMode;
 import javax.xml.rpc.Service;
 import javax.xml.rpc.ServiceFactory;
+import javax.xml.rpc.holders.StringHolder;
 
 import junit.framework.Test;
 
@@ -87,8 +88,10 @@
       call.setTargetEndpointAddress(TARGET_ENDPOINT_ADDRESS);
 
       String message = "Hello World!!";
-      String response = (String)call.invoke(new Object[] { message });
-      assertEquals(message, response);
+      StringHolder holder = new StringHolder();
+      String response = (String)call.invoke(new Object[] { message, holder });
+      assertNull(response);
+      assertEquals(message, holder.value);
    }
 
    public void testConfiguredCall() throws Exception