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 du...@apache.org on 2005/05/11 13:23:52 UTC

cvs commit: ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal ClientStubWriter.java WrapWriter.java

dushshantha    2005/05/11 04:23:52

  Modified:    c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal
                        ClientStubWriter.java WrapWriter.java
  Log:
  fix to the issues AXISCPP-639 and AXISCPP-636
  
  Revision  Changes    Path
  1.87      +12 -2     ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/ClientStubWriter.java
  
  Index: ClientStubWriter.java
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/ClientStubWriter.java,v
  retrieving revision 1.86
  retrieving revision 1.87
  diff -u -r1.86 -r1.87
  --- ClientStubWriter.java	25 Apr 2005 12:50:39 -0000	1.86
  +++ ClientStubWriter.java	11 May 2005 11:23:52 -0000	1.87
  @@ -792,8 +792,18 @@
   		    typeisarray = false;
   		}
   		typeissimple = CUtils.isSimpleType (currentParaType);
  -
  -		currentParamName = "*OutValue" + i;
  +		
  +		//Chinthana:
  +		//Changes have done for handle AXIS_OUT_PARAM Types.
  +		if (currentParaType.equals ("xsd__string")
  +				|| currentParaType.equals ("xsd__anyURI")
  +				|| currentParaType.equals ("xsd__QName")
  +				|| currentParaType.equals ("xsd__notation"))
  +			currentParamName = "*OutValue" + i;
  +		else
  +			currentParamName = "OutValue" + i;
  +		//10/05/2005.................................................
  +		
   		// Some code need to be merged as we have some duplicated in coding here.
   		if (typeisarray)
   		{
  
  
  
  1.34      +29 -8     ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/WrapWriter.java
  
  Index: WrapWriter.java
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/WrapWriter.java,v
  retrieving revision 1.33
  retrieving revision 1.34
  diff -u -r1.33 -r1.34
  --- WrapWriter.java	4 May 2005 10:36:58 -0000	1.33
  +++ WrapWriter.java	11 May 2005 11:23:52 -0000	1.34
  @@ -640,14 +640,35 @@
                           }
                           else
                           {
  -                            writer.write(
  -                                "\tpIWSSZ->addOutputParam(\""
  -                                    + returnParamName
  -                                    + "\", (void*)&out"
  -                                    + i
  -                                    + ", "
  -                                    + CUtils.getXSDTypeForBasicType(outparamType)
  -                                    + ");\n");
  +                        	//Chinthana:
  +                        	//changes have done to handle pointers.
  +                        	String containedDataType = CUtils.getXSDTypeForBasicType(outparamType);
  +                        	if (containedDataType.equals ("XSD_STRING")
  +                    				|| containedDataType.equals ("XSD_ANYURI")
  +                    				|| containedDataType.equals ("XSD_QNAME")
  +                    				|| containedDataType.equals ("XSD_NOTATION"))
  +                        	{
  +                        		writer.write(
  +                                        "\tpIWSSZ->addOutputParam(\""
  +                                            + returnParamName
  +                                            + "\", (void*)out"
  +                                            + i
  +                                            + ", "
  +                                            + CUtils.getXSDTypeForBasicType(outparamType)
  +                                            + ");\n");
  +                        	}
  +                        	else
  +                        	{
  +                        		writer.write(
  +                                        "\tpIWSSZ->addOutputParam(\""
  +                                            + returnParamName
  +                                            + "\", (void*)&out"
  +                                            + i
  +                                            + ", "
  +                                            + CUtils.getXSDTypeForBasicType(outparamType)
  +                                            + ");\n");
  +                        	}
  +                            //10/05/2005..........................................................
                           }
                       }
                       else