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/12/27 07:18:08 UTC

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

Author: dushshantha
Date: Mon Dec 26 22:18:01 2005
New Revision: 359181

URL: http://svn.apache.org/viewcvs?rev=359181&view=rev
Log:
Fixed the problem in SameComplexTypeAndElementName 
SameComplexTypeAndNillableElementName tests. 


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

Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/BeanParamWriter.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/BeanParamWriter.java?rev=359181&r1=359180&r2=359181&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/BeanParamWriter.java (original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/BeanParamWriter.java Mon Dec 26 22:18:01 2005
@@ -1046,7 +1046,9 @@
                 	{
                 		String typeName = attribs[i].getTypeName();
                 		String elementName = attribs[i].getParamNameAsMember();
-
+                		
+                		
+                		
                 		if( CUtils.isPointerType( typeName))
                 		{
                     		writer.write("\t" + typeName + "	pValue" + i + " = pIWSDZ->" +
@@ -1074,7 +1076,14 @@
                 		}
                 		else
                 		{
-                		    writer.write("\t\t\t\tparam->set" + elementName + " (pValue" + i + ");\n");
+                			String localElemName = elementName;
+                			if( elementName.endsWith( "_"))
+                            {
+                                localElemName = elementName.substring( 0, elementName.length() - 1);
+                                                                
+                            }
+                			
+                			writer.write("\t\t\t\tparam->set" + localElemName + " (pValue" + i + ");\n");
                 		}
                 		
                 		writer.write("\t\t\t\tAxis::AxisDelete( (void *) pValue" + i + ", " + CUtils.getXSDTypeForBasicType( typeName) + ");\n\n");
@@ -1114,8 +1123,15 @@
                                 + CUtils.getParameterGetValueMethodName(
                                         attribs[i].getTypeName(), attribs[i].isAttribute()) + "( \""
                                 + elementNameToSearchFor + "\",0)) != NULL)\n\t{\n");
+                        
+                        String localElemName = attribs[i].getParamNameAsMember();
+            			if( localElemName.endsWith( "_"))
+                        {
+            				localElemName = localElemName.substring( 0, localElemName.length() - 1);
+                                                            
+                        }
                         writer.write("\t\tparam->set"
-                                + attribs[i].getParamNameAsMember() + "(* "
+                                + localElemName + "(* "
                                 + attribs[i].getParamNameAsMember() + " );\n");
         				writer.write("\t\tAxis::AxisDelete( (void *) " + attribs[i].getParamNameAsMember() + ", " + CUtils.getXSDTypeForBasicType( attribs[i].getTypeName()) + ");\n");
                     	writer.write("\t}\n");