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 ru...@apache.org on 2001/05/11 22:27:47 UTC

cvs commit: xml-axis/java/src/org/apache/axis/message RPCElement.java SOAPSAXHandler.java

rubys       01/05/11 13:27:47

  Modified:    java/src/org/apache/axis MessageContext.java
               java/src/org/apache/axis/message RPCElement.java
                        SOAPSAXHandler.java
  Log:
  Clean up code that determines default properties
  
  Revision  Changes    Path
  1.20      +1 -0      xml-axis/java/src/org/apache/axis/MessageContext.java
  
  Index: MessageContext.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/MessageContext.java,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- MessageContext.java	2001/05/10 22:19:28	1.19
  +++ MessageContext.java	2001/05/11 20:27:35	1.20
  @@ -259,6 +259,7 @@
           if (bag != null) {
               bag.remove(propName);
           }
  +        serviceHandler = null;
       }
       
       public void clearProperties()
  
  
  
  1.10      +4 -2      xml-axis/java/src/org/apache/axis/message/RPCElement.java
  
  Index: RPCElement.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/message/RPCElement.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- RPCElement.java	2001/05/10 22:19:34	1.9
  +++ RPCElement.java	2001/05/11 20:27:41	1.10
  @@ -94,7 +94,6 @@
       protected String methodName;    
       protected Vector params = new Vector();
       protected Class  defaultParamTypes[] = null;
  -    protected MessageContext msgContext;
       
       public RPCElement(String namespace, String localName, Attributes attrs,
                         DeserializationContext context)
  @@ -142,7 +141,8 @@
        *  *******************************************************
        */
   
  -    public void setContext(MessageContext msgContext) {
  +    private void determineDefaultParams() {
  +        MessageContext msgContext = context.getMessageContext();
           Handler service    = msgContext.getServiceHandler();
           if (service == null) return;
   
  @@ -183,7 +183,9 @@
           RPCParam param = new RPCParam(namespace, name, attributes, context);
           
           // See if we can default xsi:type...
  +        if (params.size()==0) determineDefaultParams();
           if (defaultParamTypes!=null && params.size()<defaultParamTypes.length) {
  +            MessageContext msgContext = context.getMessageContext();
               TypeMappingRegistry typeMap = msgContext.getTypeMappingRegistry();
               param.setType(typeMap.getTypeQName(defaultParamTypes[params.size()]));
           }
  
  
  
  1.14      +0 -2      xml-axis/java/src/org/apache/axis/message/SOAPSAXHandler.java
  
  Index: SOAPSAXHandler.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/message/SOAPSAXHandler.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- SOAPSAXHandler.java	2001/05/10 16:25:16	1.13
  +++ SOAPSAXHandler.java	2001/05/11 20:27:43	1.14
  @@ -138,8 +138,6 @@
                                                        attributes,
                                                        context);
   
  -            body.setContext(context.getMessageContext());
  -
               return body;
           }
       }