axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From prad...@apache.org
Subject svn commit: r452866 - /webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisService.java
Date Wed, 04 Oct 2006 11:52:11 GMT
Author: pradine
Date: Wed Oct  4 04:52:10 2006
New Revision: 452866

URL: http://svn.apache.org/viewvc?view=rev&rev=452866
Log:
Fix for AXIS2-1298.

Modified:
    webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisService.java

Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisService.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisService.java?view=diff&rev=452866&r1=452865&r2=452866
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisService.java
(original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisService.java
Wed Oct  4 04:52:10 2006
@@ -286,9 +286,9 @@
             if (this.getOperation(axisOperation.getName()) == null) {
                 ArrayList wsamappings = axisOperation.getWsamappingList();
                 if (wsamappings != null) {
-                    for (int j = 0; j < wsamappings.size(); j++) {
+                    for (int j = 0, size = wsamappings.size(); j < size; j++) {
                         String mapping = (String) wsamappings.get(j);
-                        this.mapActionToOperation(mapping, axisOperation);
+                        mapActionToOperation(mapping, axisOperation);
                     }
                 }
                 // this operation is a control operation.
@@ -357,21 +357,30 @@
          */
 
         Iterator axisMessageIter = axisOperation.getChildren();
-        AxisMessage axisMessage;
 
         while (axisMessageIter.hasNext()) {
-            axisMessage = (AxisMessage) axisMessageIter.next();
+            AxisMessage axisMessage = (AxisMessage) axisMessageIter.next();
             String messageName = axisMessage.getName();
             if (messageName != null && !messageName.equals(operationName)) {
-                operationsAliasesMap.put(messageName, axisOperation);
+                mapActionToOperation(messageName, axisOperation);
             }
         }
 
-        operationsAliasesMap.put(operationName, axisOperation);
+        mapActionToOperation(operationName, axisOperation);
+
         String action = axisOperation.getSoapAction();
         if (action.length() > 0) {
-            operationsAliasesMap.put(action, axisOperation);
+            mapActionToOperation(action, axisOperation);
         }
+
+        ArrayList wsamappings = axisOperation.getWsamappingList();
+        if (wsamappings != null) {
+            for (int j = 0, size = wsamappings.size(); j < size; j++) {
+                String mapping = (String) wsamappings.get(j);
+                mapActionToOperation(mapping, axisOperation);
+            }
+        }
+
         if (axisOperation.getMessageReceiver() == null) {
             axisOperation.setMessageReceiver(
                     loadDefaultMessageReceiver(



---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org


Mime
View raw message