axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From t...@apache.org
Subject cvs commit: xml-axis/java/src/org/apache/axis/wsdl Emitter.java
Date Mon, 15 Oct 2001 20:49:52 GMT
tomj        01/10/15 13:49:52

  Modified:    java/src/org/apache/axis/client Call.java
               java/src/org/apache/axis/encoding ServiceDescription.java
               java/src/org/apache/axis/wsdl Emitter.java
  Log:
  Fix problem where Call wasn't correctly clearing out ServiceDescription
  params.
  
  Change ServiceDescription to keep the return type QName separate
  from the OutputParams.
  
  Add Call.removeAllParameters() to emitted stub.
  
  Revision  Changes    Path
  1.11      +13 -4     xml-axis/java/src/org/apache/axis/client/Call.java
  
  Index: Call.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/client/Call.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- Call.java	2001/10/15 19:24:00	1.10
  +++ Call.java	2001/10/15 20:49:51	1.11
  @@ -202,7 +202,7 @@
        */
       public void setReturnType(XMLType type) {
           QName qn = type.getType();
  -        serviceDesc.setOutputType(
  +        serviceDesc.setReturnType(
               new org.apache.axis.utils.QName(qn.getNamespaceURI(),
                                               qn.getLocalPart()));
       }
  @@ -211,9 +211,18 @@
        * Clears the list of parameters.
        */
       public void removeAllParameters() {
  -        paramNames.clear();
  -        paramTypes.clear();
  -        paramModes.clear();
  +        if (paramNames != null) {
  +            paramNames.clear();
  +        }
  +        if (paramTypes != null) {
  +            paramTypes.clear();
  +        }
  +        if (paramModes != null) {
  +            paramModes.clear();
  +        }
  +        if (serviceDesc != null) {
  +            serviceDesc.removeAllParams();
  +        }
       }
   
       /**
  
  
  
  1.10      +9 -3      xml-axis/java/src/org/apache/axis/encoding/ServiceDescription.java
  
  Index: ServiceDescription.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/encoding/ServiceDescription.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- ServiceDescription.java	2001/10/03 15:30:04	1.9
  +++ ServiceDescription.java	2001/10/15 20:49:51	1.10
  @@ -102,7 +102,8 @@
        */
       public Vector inputParams = new Vector();
       public Vector outputParams = new Vector();
  -    
  +    public QName returnType = null;
  +
       // Should we tack on "xsi:type" attributes?
       public boolean sendXsiType = true;
       
  @@ -146,9 +147,9 @@
           outputParams.clear();
       }
       
  -    public void setOutputType(QName type)
  +    public void setReturnType(QName type)
       {
  -        outputParams.addElement(new Param(null, type));
  +        returnType = type;
       }
       
       public void setSendTypeAttr(boolean sendType)
  @@ -236,5 +237,10 @@
           if (param != null)
               return param.type;
           return null;
  +    }
  +
  +    public QName getReturnType()
  +    {
  +        return returnType;
       }
   }
  
  
  
  1.54      +1 -0      xml-axis/java/src/org/apache/axis/wsdl/Emitter.java
  
  Index: Emitter.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/wsdl/Emitter.java,v
  retrieving revision 1.53
  retrieving revision 1.54
  diff -u -r1.53 -r1.54
  --- Emitter.java	2001/10/15 20:21:41	1.53
  +++ Emitter.java	2001/10/15 20:49:51	1.54
  @@ -1256,6 +1256,7 @@
           pw.println("        if (call.getProperty(org.apache.axis.transport.http.HTTPTransport.URL)
== null) {");
           pw.println("            throw new org.apache.axis.NoEndPointException();");
           pw.println("        }");
  +        pw.println("        call.removeAllParameters();");
   
           // DUG: need to set the isRPC flag in the Call object
   
  
  
  

Mime
View raw message