axis-c-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nadira...@apache.org
Subject svn commit: r1034635 - in /axis/axis1/c/trunk/src/wsdl/org/apache/axis/wsdl/wsdl2ws/info: MethodInfo.java WSDLInfo.java
Date Sat, 13 Nov 2010 03:17:59 GMT
Author: nadiramra
Date: Sat Nov 13 03:17:59 2010
New Revision: 1034635

URL: http://svn.apache.org/viewvc?rev=1034635&view=rev
Log:
AXISCPP-1072 Unexpected or extraneous element encountered.

Modified:
    axis/axis1/c/trunk/src/wsdl/org/apache/axis/wsdl/wsdl2ws/info/MethodInfo.java
    axis/axis1/c/trunk/src/wsdl/org/apache/axis/wsdl/wsdl2ws/info/WSDLInfo.java

Modified: axis/axis1/c/trunk/src/wsdl/org/apache/axis/wsdl/wsdl2ws/info/MethodInfo.java
URL: http://svn.apache.org/viewvc/axis/axis1/c/trunk/src/wsdl/org/apache/axis/wsdl/wsdl2ws/info/MethodInfo.java?rev=1034635&r1=1034634&r2=1034635&view=diff
==============================================================================
--- axis/axis1/c/trunk/src/wsdl/org/apache/axis/wsdl/wsdl2ws/info/MethodInfo.java (original)
+++ axis/axis1/c/trunk/src/wsdl/org/apache/axis/wsdl/wsdl2ws/info/MethodInfo.java Sat Nov
13 03:17:59 2010
@@ -34,7 +34,7 @@ public class MethodInfo
     private Parameters operationParameters;
     private ArrayList inputParameters;
     private ArrayList outputParameters;
-    private String soapAction = null;
+    private String soapAction = "";
     private QName inputMessage;
     private QName outputMessage;
     private ArrayList faultType;
@@ -94,6 +94,9 @@ public class MethodInfo
 
     public void setSoapAction(String string)
     {
+        if (string == null)
+            string = "";
+        
         soapAction = string;
     }
 

Modified: axis/axis1/c/trunk/src/wsdl/org/apache/axis/wsdl/wsdl2ws/info/WSDLInfo.java
URL: http://svn.apache.org/viewvc/axis/axis1/c/trunk/src/wsdl/org/apache/axis/wsdl/wsdl2ws/info/WSDLInfo.java?rev=1034635&r1=1034634&r2=1034635&view=diff
==============================================================================
--- axis/axis1/c/trunk/src/wsdl/org/apache/axis/wsdl/wsdl2ws/info/WSDLInfo.java (original)
+++ axis/axis1/c/trunk/src/wsdl/org/apache/axis/wsdl/wsdl2ws/info/WSDLInfo.java Sat Nov 13
03:17:59 2010
@@ -629,7 +629,12 @@ public class WSDLInfo
             if (null == type.getRefType())
                 throw new WrapperFault("Array type found without a Ref type");
             
+            // Handle array that references an element
             QName qn = type.getRefType().getQName();
+            // TODO
+//            if (type.getRefType().getRefType() != null)
+//                qn = type.getRefType().getRefType().getQName();
+           
             if (null == qn)
                 throw new WrapperFault("Array type found without a Ref type");
             
@@ -1388,7 +1393,7 @@ public class WSDLInfo
                 type.setIsUnwrappedOutputType(true);
                 pinfo.setParamName(elementName, c_typeMap);
                 
-                if (!elementNames.hasNext() && (type.isSimpleType() || type.isPrimitiveType()))
+                if (element != null)
                     pinfo.setElementName(element.getQName());
                 else
                     pinfo.setElementName(type.getName());
@@ -1556,7 +1561,7 @@ public class WSDLInfo
                 type.setIsUnwrappedInputType(true);
                 pinfo.setParamName(elementName, c_typeMap);
                 
-                if (!elementNames.hasNext() && (type.isSimpleType() || type.isPrimitiveType()))
+                if (element != null)
                     pinfo.setElementName(element.getQName());
                 else
                     pinfo.setElementName(type.getName());



Mime
View raw message