root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

SPR-7621 - AbstractStaxContentHandler sets NamespaceContext on every start/end element

This commit is contained in:
Arjen Poutsma 2010-10-12 09:41:23 +00:00
parent ab21dbad08
commit 35da7bdb44
2 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
org.springframework.core/src/main/java/org/springframework/util/xml/SimpleNamespaceContext.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2009 the original author or authors. * Copyright 2002-2010 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -117,7 +117,7 @@ public class SimpleNamespaceContext implements NamespaceContext {
* *
* @return the declared prefixes * @return the declared prefixes
*/ */
public Iterator getBoundPrefixes() { public Iterator<String> getBoundPrefixes() {
return prefixToNamespaceUri.keySet().iterator(); return prefixToNamespaceUri.keySet().iterator();
} }

20
org.springframework.core/src/main/java/org/springframework/util/xml/StaxStreamContentHandler.java
View File

@ -90,15 +90,17 @@ class StaxStreamContentHandler extends AbstractStaxContentHandler {
protected void startElementInternal(QName name, Attributes attributes, SimpleNamespaceContext namespaceContext) protected void startElementInternal(QName name, Attributes attributes, SimpleNamespaceContext namespaceContext)
throws XMLStreamException { throws XMLStreamException {
streamWriter.writeStartElement(name.getPrefix(), name.getLocalPart(), name.getNamespaceURI()); streamWriter.writeStartElement(name.getPrefix(), name.getLocalPart(), name.getNamespaceURI());
String defaultNamespaceUri = namespaceContext.getNamespaceURI(""); if (namespaceContext != null) {
if (StringUtils.hasLength(defaultNamespaceUri)) { String defaultNamespaceUri = namespaceContext.getNamespaceURI("");
streamWriter.writeNamespace("", defaultNamespaceUri); if (StringUtils.hasLength(defaultNamespaceUri)) {
streamWriter.setDefaultNamespace(defaultNamespaceUri); streamWriter.writeNamespace("", defaultNamespaceUri);
} streamWriter.setDefaultNamespace(defaultNamespaceUri);
for (Iterator iterator = namespaceContext.getBoundPrefixes(); iterator.hasNext();) { }
String prefix = (String) iterator.next(); for (Iterator<String> iterator = namespaceContext.getBoundPrefixes(); iterator.hasNext();) {
streamWriter.writeNamespace(prefix, namespaceContext.getNamespaceURI(prefix)); String prefix = iterator.next();
streamWriter.setPrefix(prefix, namespaceContext.getNamespaceURI(prefix)); streamWriter.writeNamespace(prefix, namespaceContext.getNamespaceURI(prefix));
streamWriter.setPrefix(prefix, namespaceContext.getNamespaceURI(prefix));
}
} }
for (int i = 0; i < attributes.getLength(); i++) { for (int i = 0; i < attributes.getLength(); i++) {
QName attrName = toQName(attributes.getURI(i), attributes.getQName(i)); QName attrName = toQName(attributes.getURI(i), attributes.getQName(i));