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 to...@apache.org on 2003/04/18 16:23:43 UTC

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

tomj        2003/04/18 07:23:43

  Modified:    java/src/org/apache/axis/encoding/ser BeanSerializer.java
               java/src/org/apache/axis/message RPCElement.java
  Log:
  Fix bug 17746 - xmlns="" added in the wrong place.
  
  Patch from Adam Craven (adam_craven@technologyonecorp.com)
  
  Revision  Changes    Path
  1.64      +5 -1      xml-axis/java/src/org/apache/axis/encoding/ser/BeanSerializer.java
  
  Index: BeanSerializer.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/encoding/ser/BeanSerializer.java,v
  retrieving revision 1.63
  retrieving revision 1.64
  diff -u -r1.63 -r1.64
  --- BeanSerializer.java	31 Dec 2002 16:00:11 -0000	1.63
  +++ BeanSerializer.java	18 Apr 2003 14:23:42 -0000	1.64
  @@ -188,7 +188,11 @@
   
                   if (qname == null) {
                       // Use the default...
  -                    qname = new QName("", propName);
  +                    // The default qname would inherit the namespace of a
  +                    // parent. Setting this namespace to "" causes interop
  +                    // issues when the "literal" style is used - 
  +                    // most of the elements will be serialised with xmlns=""
  +                    qname = new QName(name.getNamespaceURI(), propName);
                   }
   
                   if (xmlType == null) {
  
  
  
  1.86      +3 -3      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.85
  retrieving revision 1.86
  diff -u -r1.85 -r1.86
  --- RPCElement.java	2 Mar 2003 06:36:19 -0000	1.85
  +++ RPCElement.java	18 Apr 2003 14:23:42 -0000	1.86
  @@ -132,7 +132,7 @@
               } else {
                   String name = null;
                   if (name == null) name = "arg" + i;
  -                addParam(new RPCParam(name, args[i]));
  +                addParam(new RPCParam(namespace, name, args[i]));
               }
           }
       }
  @@ -375,12 +375,12 @@
               if (encodingStyle != null && encodingStyle.equals("")) {
                   context.registerPrefixForURI("", getNamespaceURI());
               }
  -            context.startElement(new QName(namespaceURI,name), attributes);
  +            context.startElement(new QName(getNamespaceURI(), name), attributes);
           }
   
           for (int i = 0; i < params.size(); i++) {
               RPCParam param = (RPCParam)params.elementAt(i);
  -            if (!hasOperationElement && encodingStyle.equals("")) {
  +            if (!hasOperationElement && encodingStyle != null && encodingStyle.equals("")) {
                   context.registerPrefixForURI("", param.getQName().getNamespaceURI());
               }
               param.serialize(context);