[bugfix] Further improvements to coalescing namespace prefixes

adamretter · adamretter · commit 5f122c37597e · 2025-08-08T19:48:21.000+02:00
See #46
diff --git a/exist-core/src/main/java/org/exist/util/serializer/SAXSerializer.java b/exist-core/src/main/java/org/exist/util/serializer/SAXSerializer.java
@@ -317,7 +317,7 @@ public void startElement(final QName qname, final AttrList attribs) throws SAXEx
             for (final Map.Entry<String, String> nsEntry : optionalNamespaceDecls.entrySet()) {
                 final String prefix = nsEntry.getKey();
                 final String uri = nsEntry.getValue();
-                if (!(elemPrefixedNsIsDefaultNs && uri.equals(namespaceURI) && elemPrefix.equals(prefix))) {
+                if (!(elemPrefixedNsIsDefaultNs && uri.equals(namespaceURI) && StringUtil.equals(qname.getPrefix(), prefix))) {
                     receiver.namespace(prefix, uri);
                 }
             }
@@ -328,7 +328,7 @@ public void startElement(final QName qname, final AttrList attribs) throws SAXEx
                 }
                 final String uri = nsEntry.getValue();
                 if(!optionalNamespaceDecls.containsKey(prefix)) {
-                    if (!(elemPrefixedNsIsDefaultNs && uri.equals(namespaceURI) && elemPrefix.equals(prefix))) {
+                    if (!(elemPrefixedNsIsDefaultNs && uri.equals(namespaceURI) && StringUtil.equals(qname.getPrefix(), prefix))) {
                         receiver.namespace(prefix, uri);
                     }
                 }

Original file line number	Diff line number	Diff line change
`@@ -317,7 +317,7 @@ public void startElement(final QName qname, final AttrList attribs) throws SAXEx`
`317`	`317`	`for (final Map.Entry<String, String> nsEntry : optionalNamespaceDecls.entrySet()) {`
`318`	`318`	`final String prefix = nsEntry.getKey();`
`319`	`319`	`final String uri = nsEntry.getValue();`
`320`		`- if (!(elemPrefixedNsIsDefaultNs && uri.equals(namespaceURI) && elemPrefix.equals(prefix))) {`
	`320`	`+ if (!(elemPrefixedNsIsDefaultNs && uri.equals(namespaceURI) && StringUtil.equals(qname.getPrefix(), prefix))) {`
`321`	`321`	`receiver.namespace(prefix, uri);`
`322`	`322`	`}`
`323`	`323`	`}`
`@@ -328,7 +328,7 @@ public void startElement(final QName qname, final AttrList attribs) throws SAXEx`
`328`	`328`	`}`
`329`	`329`	`final String uri = nsEntry.getValue();`
`330`	`330`	`if(!optionalNamespaceDecls.containsKey(prefix)) {`
`331`		`- if (!(elemPrefixedNsIsDefaultNs && uri.equals(namespaceURI) && elemPrefix.equals(prefix))) {`
	`331`	`+ if (!(elemPrefixedNsIsDefaultNs && uri.equals(namespaceURI) && StringUtil.equals(qname.getPrefix(), prefix))) {`
`332`	`332`	`receiver.namespace(prefix, uri);`
`333`	`333`	`}`
`334`	`334`	`}`