bodewig commented on code in PR #111:
URL: https://github.com/apache/ant-ivy/pull/111#discussion_r2809721777


##########
src/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorUpdater.java:
##########
@@ -409,13 +410,22 @@ public void startElement(String uri, String localName, 
String qName, Attributes
 
                 // copy
                 write("<" + qName);
-                for (int i = 0; i < attributes.getLength(); i++) {
-                    write(" " + attributes.getQName(i) + "=\""
-                            + substitute(settings, attributes.getValue(i)) + 
"\"");
+                if (options.isMerge() && path.equals("ivy-module")) {
+                    for (int i = 0, n = attributes.getLength(); i < n; i += 1) 
{
+                        if (attributes.getQName(i).startsWith("xmlns:")) 
continue;
+                        write(" " + attributes.getQName(i) + "=\"" + 
substitute(settings, attributes.getValue(i)) + "\"");
+                    }
+                    Map<String, String> namespaces = 
options.getMergedDescriptor().getExtraAttributesNamespaces();
+                    for (Map.Entry<String, String> namespace : 
namespaces.entrySet()) {
+                        write(" xmlns:" + namespace.getKey() + "=\"" + 
substitute(settings, namespace.getValue()) + "\"");
+                    }
+                } else {
+                    for (int i = 0, n = attributes.getLength(); i < n; i += 1) 
{

Review Comment:
   Just to be clear: This is not anything that would make me reject the PR and 
I'm not asking you to revert it.
   
   Small changes like this tend to distract me from the real changes and thus 
make reviews harder and slower - and I ask you to avoid them in the future.



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: [email protected]

For queries about this service, please contact Infrastructure at:
[email protected]


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to