You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by da...@apache.org on 2006/10/08 20:39:38 UTC

svn commit: r454188 - in /webservices/axis2/branches/java/1_1/modules: codegen/src/org/apache/axis2/wsdl/codegen/emitter/AxisServiceBasedMultiLanguageEmitter.java kernel/src/org/apache/axis2/deployment/DescriptionBuilder.java

Author: davidillsley
Date: Sun Oct  8 11:39:38 2006
New Revision: 454188

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

Modify AxisServiceBasedMultiLanguageEmitter to reduce the chance of an empty action being generated
Modify DescriptionBuilder to ignore empty actions read from a configuration file

Modified:
    webservices/axis2/branches/java/1_1/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/AxisServiceBasedMultiLanguageEmitter.java
    webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/deployment/DescriptionBuilder.java

Modified: webservices/axis2/branches/java/1_1/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/AxisServiceBasedMultiLanguageEmitter.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/AxisServiceBasedMultiLanguageEmitter.java?view=diff&rev=454188&r1=454187&r2=454188
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/AxisServiceBasedMultiLanguageEmitter.java (original)
+++ webservices/axis2/branches/java/1_1/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/AxisServiceBasedMultiLanguageEmitter.java Sun Oct  8 11:39:38 2006
@@ -1677,7 +1677,7 @@
      * @param axisOperation
      */
     protected void addSOAPAction(Document doc, Element rootElement, AxisOperation axisOperation) {
-        addAttribute(doc, "soapaction", axisOperation.getSoapAction(), rootElement);
+        addAttribute(doc, "soapaction", axisOperation.getInputAction(), rootElement);
     }
 
     /**

Modified: webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/deployment/DescriptionBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/deployment/DescriptionBuilder.java?view=diff&rev=454188&r1=454187&r2=454188
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/deployment/DescriptionBuilder.java (original)
+++ webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/deployment/DescriptionBuilder.java Sun Oct  8 11:39:38 2006
@@ -463,7 +463,13 @@
             if (log.isTraceEnabled()) {
                 log.trace("Input Action Mapping found: " + inputActionString);
             }
-            mappingList.add(inputActionString);
+            if(!"".equals(inputActionString)){
+                mappingList.add(inputActionString);
+            }else{
+                if (log.isTraceEnabled()) {
+                    log.trace("Zero length input action string found. Not added to mapping");
+                }
+            }
         }
         op_descrip.setWsamappingList(mappingList);
 



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