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 pr...@apache.org on 2005/11/30 18:24:48 UTC

svn commit: r349994 - /webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/ClientStubWriter.java

Author: prestonf
Date: Wed Nov 30 09:24:44 2005
New Revision: 349994

URL: http://svn.apache.org/viewcvs?rev=349994&view=rev
Log:
Update for extra checking on parameters on AXIS_OUT_PARAMS

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

Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/ClientStubWriter.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/ClientStubWriter.java?rev=349994&r1=349993&r2=349994&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/ClientStubWriter.java (original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/ClientStubWriter.java Wed Nov 30 09:24:44 2005
@@ -855,13 +855,6 @@
 		        
 				if (CUtils.isPointerType(currentParaType))
 				{
-/*					writer.write ("\t\t\t"
-					      + currentParamName
-					      + " = m_pCall->"
-					      + CUtils.getParameterGetValueMethodName(currentParaType,false) 
-						+ "(\"" + currentType.getParamName () 
-						+ "\", 0);\n");
-*/
 				    String xsdType =  WrapperUtils.getClassNameFromParamInfoConsideringArrays ((ParameterInfo) paramsC.get (i), wscontext);
 				    
 				    if( !CUtils.isPointerType(xsdType))
@@ -871,7 +864,7 @@
 				    
 				    writer.write( "\t\t\t" + currentParaType + " pReturn" + i + " = m_pCall->" + CUtils.getParameterGetValueMethodName( currentParaType, false) + "( \"" + currentType.getParamName() + "\", 0);\n");
 				    writer.write( "\n");
-				    writer.write( "\t\t\tif( OutValue" + i + " != NULL)\n");
+				    writer.write( "\t\t\tif( pReturn" + i + " != NULL && OutValue" + i + " != NULL)\n");
 				    writer.write( "\t\t\t\t{\n");
 				    writer.write( "\t\t\t\tif( *OutValue" + i + " != NULL)\n");
 				    writer.write( "\t\t\t\t{\n");
@@ -899,16 +892,9 @@
 				}
 				else 
 				{
-/*					writer.write ("\t\t\t"
-					      + currentParamName
-					      + " = *(m_pCall->"
-					      + CUtils.getParameterGetValueMethodName(currentParaType,false) 
-						+ "(\"" + currentType.getParamName () 
-						+ "\", 0));\n");
-*/
 				    writer.write( "\t\t\t" + currentParaType + " * pReturn" + i + " = m_pCall->" + CUtils.getParameterGetValueMethodName( currentParaType, false) + "( \"" + currentType.getParamName() + "\", 0);\n");
 				    writer.write( "\n");
-				    writer.write( "\t\t\tif( OutValue" + i + " != NULL)\n");
+				    writer.write( "\t\t\tif( pReturn" + i + " != NULL && OutValue" + i + " != NULL)\n");
 				    writer.write( "\t\t\t{\n");
 				    writer.write( "\t\t\t\tif( *OutValue" + i + " == NULL)\n");
 				    writer.write( "\t\t\t\t{\n");