axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From di...@apache.org
Subject svn commit: r377727 - /webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/WrapWriter.java
Date Tue, 14 Feb 2006 13:41:45 GMT
Author: dicka
Date: Tue Feb 14 05:41:43 2006
New Revision: 377727

URL: http://svn.apache.org/viewcvs?rev=377727&view=rev
Log:
AXISCPP-149

Correct generated service code for nillable arrays.

Modified:
    webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/WrapWriter.java

Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/WrapWriter.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/WrapWriter.java?rev=377727&r1=377726&r2=377727&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/WrapWriter.java
(original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/WrapWriter.java
Tue Feb 14 05:41:43 2006
@@ -493,46 +493,21 @@
             {
             	writer.write(" *");
             }
-            //Chinthana:Add concept to handle nilable arrays.
-            if(returntypeisarray && returntypeissimple && returntype.isNillable()
&& outparamType != "xsd__string_Array")
+            
+            //06-06-2005...................................................................
+            writer.write(" ret = "
+                    + "pWs->"
+                    + methodName
+                    + "(");
+            if (0 < paramsB.size())
             {
-            	
-                writer.write(" ret = "
-                        + "*(pWs->"
-                        + methodName
-                        + "(");
-                if (0 < paramsB.size())
+                for (int i = 0; i < paramsB.size() - 1; i++)
                 {
-                    for (int i = 0; i < paramsB.size() - 1; i++)
-                    {
-                    	ParameterInfo param = (ParameterInfo) paramsB.get(i);
-                        if(param.isNillable())
-                        	writer.write("&");
-                        writer.write("v" + i + ",");
-                    }
-                    ParameterInfo param = (ParameterInfo) paramsB.get(0);
-                    if(param.isNillable())
-                    	writer.write("&");
-                    writer.write("v" + (paramsB.size() - 1));
+                    writer.write("v" + i + ",");
                 }
-                writer.write(")");
-            }
-            else
-            {
-            //06-06-2005...................................................................
-	            writer.write(" ret = "
-	                    + "pWs->"
-	                    + methodName
-	                    + "(");
-	            if (0 < paramsB.size())
-	            {
-	                for (int i = 0; i < paramsB.size() - 1; i++)
-	                {
-	                    writer.write("v" + i + ",");
-	                }
-	                writer.write("v" + (paramsB.size() - 1));
-	            }
+                writer.write("v" + (paramsB.size() - 1));
             }
+
             writer.write(");\n");
             /* set the result */
             if (returntypeissimple)
@@ -542,7 +517,7 @@
                     String containedType =
                         CUtils.getclass4qname(retType.getName());
                     writer.write(
-                        "\t\treturn pIWSSZ->addOutputBasicArrayParam(ret,"
+                        "\t\treturn pIWSSZ->addOutputBasicArrayParam(ret, "
                             + CUtils.getXSDTypeForBasicType(containedType)
                             + ", \""
                             + returnParamName



Mime
View raw message