You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by de...@apache.org on 2006/03/07 11:02:04 UTC

svn commit: r383835 - in /webservices/axis2/trunk/java/modules/core/src/org/apache/axis2: client/ServiceClient.java description/AxisOperation.java

Author: deepal
Date: Tue Mar  7 02:02:01 2006
New Revision: 383835

URL: http://svn.apache.org/viewcvs?rev=383835&view=rev
Log:
-fixing module engagement problem (thx Chamikara)

Modified:
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/ServiceClient.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisOperation.java

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/ServiceClient.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/ServiceClient.java?rev=383835&r1=383834&r2=383835&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/ServiceClient.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/ServiceClient.java Tue Mar  7 02:02:01 2006
@@ -391,12 +391,10 @@
     public void fireAndForget(QName operation, OMElement elem) throws AxisFault {
         // look up the appropriate axisop and create the client
         OperationClient mepClient = createClient(operation);
-
         // create a message context and put the payload in there along with any
         // headers
         MessageContext mc = new MessageContext();
         fillSoapEnvelope(mc, elem);
-
         // add the message context there and have it go
         mepClient.addMessageContext(mc);
         mepClient.execute(false);

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisOperation.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisOperation.java?rev=383835&r1=383834&r2=383835&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisOperation.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisOperation.java Tue Mar  7 02:02:01 2006
@@ -172,13 +172,6 @@
         for (Iterator iterator = col.iterator(); iterator.hasNext();) {
             AxisOperation axisOperation = copyOperation((AxisOperation) iterator.next());
             ArrayList wsamappings = axisOperation.getWsamappingList();
-            if (wsamappings != null) {
-                for (int j = 0; j < wsamappings.size(); j++) {
-                    String mapping = (String) wsamappings.get(j);
-
-                    service.mapActionToOperation(mapping, axisOperation);
-                }
-            }
             if (service.getOperation(axisOperation.getName()) == null) {
                 // this opration is a control operation.
                 axisOperation.setControlOperation(true);
@@ -188,6 +181,13 @@
                 }
                 phaseResolver.engageModuleToOperation(axisOperation, module);
                 ops.add(axisOperation);
+                if (wsamappings != null) {
+                    for (int j = 0; j < wsamappings.size(); j++) {
+                        String mapping = (String) wsamappings.get(j);
+
+                        service.mapActionToOperation(mapping, axisOperation);
+                    }
+                }
             }
         }
         return ops;