svn commit: r1058574 - /tuscany/sca-java-2.x/trunk/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java

[slaws]

Author: slaws
Date: Thu Jan 13 14:12:04 2011
New Revision: 1058574

URL: http://svn.apache.org/viewvc?rev=1058574&view=rev
Log:
Don't add a namespace twice.

Modified:
    
tuscany/sca-java-2.x/trunk/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java

Modified: 
tuscany/sca-java-2.x/trunk/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java
URL: 
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java?rev=1058574&r1=1058573&r2=1058574&view=diff
==============================================================================
--- 
tuscany/sca-java-2.x/trunk/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java
 (original)
+++ 
tuscany/sca-java-2.x/trunk/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java
 Thu Jan 13 14:12:04 2011
@@ -1173,15 +1173,21 @@ public class CompositeProcessor extends 
                                 writer.writeStartElement(name.getPrefix(), 
name.getLocalPart(), name.getNamespaceURI());
 
                                 int namespaces = reader.getNamespaceCount();
+                                boolean elementNamespaceAdded = false;
                                 for (int i = 0; i < namespaces; i++) {
                                     String prefix = 
reader.getNamespacePrefix(i);
                                     String ns = reader.getNamespaceURI(i);
                                     writer.writeNamespace(prefix, ns);
+                                    if(ns.equals(name.getNamespaceURI())){
+                                        elementNamespaceAdded = true;
+                                    }
                                 }
-
-                                if (!"".equals(name.getNamespaceURI())) {
+                                
+                                if (!"".equals(name.getNamespaceURI()) && 
+                                    !elementNamespaceAdded) {
                                     writer.writeNamespace(name.getPrefix(), 
name.getNamespaceURI());
                                 }
+                                
 
                                 // add the attributes for this element
                                 namespaces = reader.getAttributeCount();