svn commit: r395521 - /webservices/commons/trunk/modules/axiom/src/org/apache/axiom/om/impl/util/OMSerializerUtil.java

[chinthaka]

Author: chinthaka
Date: Thu Apr 20 00:35:40 2006
New Revision: 395521

URL: http://svn.apache.org/viewcvs?rev=395521&view=rev
Log:
Fixing a small namespace issue.


Modified:
    
webservices/commons/trunk/modules/axiom/src/org/apache/axiom/om/impl/util/OMSerializerUtil.java

Modified: 
webservices/commons/trunk/modules/axiom/src/org/apache/axiom/om/impl/util/OMSerializerUtil.java
URL: 
http://svn.apache.org/viewcvs/webservices/commons/trunk/modules/axiom/src/org/apache/axiom/om/impl/util/OMSerializerUtil.java?rev=395521&r1=395520&r2=395521&view=diff
==============================================================================
--- 
webservices/commons/trunk/modules/axiom/src/org/apache/axiom/om/impl/util/OMSerializerUtil.java
 (original)
+++ 
webservices/commons/trunk/modules/axiom/src/org/apache/axiom/om/impl/util/OMSerializerUtil.java
 Thu Apr 20 00:35:40 2006
@@ -95,7 +95,7 @@
         if (uri != null && !"".equals(uri)) {
             String prefixFromWriter = writer.getPrefix(uri);
             // lets see whether we have default namespace now
-            if (prefix != null && "".equals(prefix) && prefixFromWriter == 
null) {
+            if (prefix != null && "".equals(prefix) && (prefixFromWriter == 
null || !prefix.equals(prefixFromWriter))) {
                 // this has not been declared earlier
                 writer.writeDefaultNamespace(uri);
                 writer.setDefaultNamespace(uri);
@@ -103,6 +103,7 @@
                 prefix = prefix == null ? getNextNSPrefix() : prefix;
                 if (prefix != null && !prefix.equals(prefixFromWriter)) {
                     writer.writeNamespace(prefix, uri);
+                    writer.setPrefix(prefix, uri);
                 }
             }
         }