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 di...@apache.org on 2003/06/30 20:25:07 UTC

cvs commit: xml-axis/java/test/encoding TestDOM.java

dims        2003/06/30 11:25:07

  Modified:    java/src/org/apache/axis/encoding
                        SerializationContextImpl.java
               java/test/encoding TestDOM.java
  Log:
  Fix for Bug 20650 - Duplicate Namespace Declaration: Bug in Serialization.
  
  Revision  Changes    Path
  1.94      +4 -1      xml-axis/java/src/org/apache/axis/encoding/SerializationContextImpl.java
  
  Index: SerializationContextImpl.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/encoding/SerializationContextImpl.java,v
  retrieving revision 1.93
  retrieving revision 1.94
  diff -u -r1.93 -r1.94
  --- SerializationContextImpl.java	18 Jun 2003 23:01:49 -0000	1.93
  +++ SerializationContextImpl.java	30 Jun 2003 18:25:06 -0000	1.94
  @@ -461,7 +461,10 @@
                   nsStack.push();
                   noNamespaceMappings = false;
               }
  -            nsStack.add(uri, prefix);
  +            String activePrefix = nsStack.getPrefix(uri,true);
  +            if(activePrefix == null || !activePrefix.equals(prefix)) {
  +                nsStack.add(uri, prefix);
  +            }
           }
       }
   
  
  
  
  1.16      +0 -1      xml-axis/java/test/encoding/TestDOM.java
  
  Index: TestDOM.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/test/encoding/TestDOM.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- TestDOM.java	11 Dec 2002 17:17:44 -0000	1.15
  +++ TestDOM.java	30 Jun 2003 18:25:06 -0000	1.16
  @@ -34,7 +34,6 @@
           " xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\">\n" +
           "  <SOAP-ENV:Header>\n" +
           "    <SOAP-SEC:signature SOAP-ENV:actor=\"null\" SOAP-ENV:mustUnderstand=\"1\"" +
  -        " xmlns:SOAP-ENV=\"http://schemas.xmlsoap.org/soap/envelope/\"" +
           " xmlns:SOAP-SEC=\"http://schemas.xmlsoap.org/soap/security/\">\n" +
           "       <Signature xmlns=\"http://www.w3.org/2000/09/xmldsig#\">\n" +
           "       </Signature>\n" +