You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by du...@apache.org on 2005/06/15 07:33:01 UTC
cvs commit: ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp ServiceHeaderWriter.java ServiceWriter.java
dushshantha 2005/06/14 22:33:01
Modified: c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp
ServiceHeaderWriter.java ServiceWriter.java
Log:
Fix to the issue AXISCPP-678
Revision Changes Path
1.36 +8 -3 ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ServiceHeaderWriter.java
Index: ServiceHeaderWriter.java
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ServiceHeaderWriter.java,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- ServiceHeaderWriter.java 3 Jun 2005 08:55:39 -0000 1.35
+++ ServiceHeaderWriter.java 15 Jun 2005 05:33:01 -0000 1.36
@@ -169,10 +169,13 @@
//write return type
writer.write(minfo.getMethodname() + "(");
//write parameter names
+
+ boolean hasInputParms = false;
Iterator params = minfo.getInputParameterTypes().iterator();
if (params.hasNext())
{
- ParameterInfo fparam = (ParameterInfo) params.next();
+ hasInputParms = true;
+ ParameterInfo fparam = (ParameterInfo) params.next();
String paramTypeName = fparam.getLangName();
if (CUtils.isSimpleType(paramTypeName)
&& fparam.isNillable()
@@ -232,8 +235,10 @@
for (int j = 0; params.hasNext(); j++)
{
ParameterInfo nparam = (ParameterInfo) params.next();
- writer.write(
- ", AXIS_OUT_PARAM "
+ String comma = ", ";
+ if (!hasInputParms && 0==j) comma = "";
+ writer.write(comma
+ + "AXIS_OUT_PARAM "
+ WrapperUtils
.getClassNameFromParamInfoConsideringArrays(
nparam,
1.27 +9 -3 ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ServiceWriter.java
Index: ServiceWriter.java
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ServiceWriter.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- ServiceWriter.java 3 Jun 2005 08:55:39 -0000 1.26
+++ ServiceWriter.java 15 Jun 2005 05:33:01 -0000 1.27
@@ -187,10 +187,13 @@
}
writer.write(classname + "::" + minfo.getMethodname() + "(");
//write parameter names
+
+ boolean hasInputParms = false;
Iterator params = minfo.getInputParameterTypes().iterator();
if (params.hasNext())
{
- ParameterInfo fparam = (ParameterInfo) params.next();
+ hasInputParms = true;
+ ParameterInfo fparam = (ParameterInfo) params.next();
String fparamTypeName = fparam.getLangName();
if (CUtils.isSimpleType(fparamTypeName)
&& fparam.isNillable()
@@ -250,8 +253,11 @@
for (int j = 0; params.hasNext(); j++)
{
ParameterInfo nparam = (ParameterInfo) params.next();
- writer.write(
- ", AXIS_OUT_PARAM "
+
+ String comma = ", ";
+ if (!hasInputParms && 0==j) comma = "";
+ writer.write(comma
+ + "AXIS_OUT_PARAM "
+ WrapperUtils
.getClassNameFromParamInfoConsideringArrays(
nparam,