From 4a1762b6795b686ff2dc98e7a7144dd5130cd631 Mon Sep 17 00:00:00 2001 From: Arjen Poutsma Date: Fri, 31 Jul 2009 09:02:02 +0000 Subject: [PATCH] SWS-521 - UnsupportedOperationException During Validation After Upgrade From 1.5.6 to 1.5.7 --- .../xml/namespace/SimpleNamespaceContext.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/xml/src/main/java/org/springframework/xml/namespace/SimpleNamespaceContext.java b/xml/src/main/java/org/springframework/xml/namespace/SimpleNamespaceContext.java index fd0e577c..a4a80468 100644 --- a/xml/src/main/java/org/springframework/xml/namespace/SimpleNamespaceContext.java +++ b/xml/src/main/java/org/springframework/xml/namespace/SimpleNamespaceContext.java @@ -102,6 +102,13 @@ public class SimpleNamespaceContext implements NamespaceContext { Assert.notNull(namespaceUri, "No namespaceUri given"); if (XMLConstants.DEFAULT_NS_PREFIX.equals(prefix)) { defaultNamespaceUri = namespaceUri; + } else if (XMLConstants.XML_NS_PREFIX.equals(prefix)) { + Assert.isTrue(XMLConstants.XML_NS_URI.equals(namespaceUri), "Prefix \"" + prefix + + "\" bound to namespace \"" + namespaceUri + "\" (should be \"" + XMLConstants.XML_NS_URI + "\")"); + } else if (XMLConstants.XMLNS_ATTRIBUTE.equals(prefix)) { + Assert.isTrue(XMLConstants.XMLNS_ATTRIBUTE_NS_URI.equals(namespaceUri), "Prefix \"" + prefix + + "\" bound to namespace \"" + namespaceUri + "\" (should be \"" + + XMLConstants.XMLNS_ATTRIBUTE_NS_URI + "\")"); } else { prefixToNamespaceUri.put(prefix, namespaceUri); @@ -112,6 +119,7 @@ public class SimpleNamespaceContext implements NamespaceContext { /** Removes all declared prefixes. */ public void clear() { prefixToNamespaceUri.clear(); + namespaceUriToPrefixes.clear(); } /**