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:35:23 +00:00
parent c32c0d5674
commit ab21dbad08
2 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
org.springframework.core/src/main/java/org/springframework/util/xml/AbstractStaxContentHandler.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.
@ -35,8 +35,11 @@ abstract class AbstractStaxContentHandler implements ContentHandler {
private SimpleNamespaceContext namespaceContext = new SimpleNamespaceContext(); private SimpleNamespaceContext namespaceContext = new SimpleNamespaceContext();
private boolean namespaceContextChanged = false;
public final void startDocument() throws SAXException { public final void startDocument() throws SAXException {
namespaceContext.clear(); namespaceContext.clear();
namespaceContextChanged = false;
try { try {
startDocumentInternal(); startDocumentInternal();
} }
@ -49,6 +52,7 @@ abstract class AbstractStaxContentHandler implements ContentHandler {
public final void endDocument() throws SAXException { public final void endDocument() throws SAXException {
namespaceContext.clear(); namespaceContext.clear();
namespaceContextChanged = false;
try { try {
endDocumentInternal(); endDocumentInternal();
} }
@ -66,6 +70,7 @@ abstract class AbstractStaxContentHandler implements ContentHandler {
*/ */
public final void startPrefixMapping(String prefix, String uri) { public final void startPrefixMapping(String prefix, String uri) {
namespaceContext.bindNamespaceUri(prefix, uri); namespaceContext.bindNamespaceUri(prefix, uri);
namespaceContextChanged = true;
} }
/** /**
@ -75,11 +80,13 @@ abstract class AbstractStaxContentHandler implements ContentHandler {
*/ */
public final void endPrefixMapping(String prefix) { public final void endPrefixMapping(String prefix) {
namespaceContext.removeBinding(prefix); namespaceContext.removeBinding(prefix);
namespaceContextChanged = true;
} }
public final void startElement(String uri, String localName, String qName, Attributes atts) throws SAXException { public final void startElement(String uri, String localName, String qName, Attributes atts) throws SAXException {
try { try {
startElementInternal(toQName(uri, qName), atts, namespaceContext); startElementInternal(toQName(uri, qName), atts, namespaceContextChanged ? namespaceContext : null);
namespaceContextChanged = false;
} }
catch (XMLStreamException ex) { catch (XMLStreamException ex) {
throw new SAXException("Could not handle startElement: " + ex.getMessage(), ex); throw new SAXException("Could not handle startElement: " + ex.getMessage(), ex);
@ -91,7 +98,8 @@ abstract class AbstractStaxContentHandler implements ContentHandler {
public final void endElement(String uri, String localName, String qName) throws SAXException { public final void endElement(String uri, String localName, String qName) throws SAXException {
try { try {
endElementInternal(toQName(uri, qName), namespaceContext); endElementInternal(toQName(uri, qName), namespaceContextChanged ? namespaceContext : null);
namespaceContextChanged = false;
} }
catch (XMLStreamException ex) { catch (XMLStreamException ex) {
throw new SAXException("Could not handle endElement: " + ex.getMessage(), ex); throw new SAXException("Could not handle endElement: " + ex.getMessage(), ex);

8
org.springframework.core/src/main/java/org/springframework/util/xml/StaxEventContentHandler.java
View File

@ -95,13 +95,13 @@ class StaxEventContentHandler extends AbstractStaxContentHandler {
throws XMLStreamException { throws XMLStreamException {
List attributes = getAttributes(atts); List attributes = getAttributes(atts);
List namespaces = createNamespaces(namespaceContext); List namespaces = createNamespaces(namespaceContext);
consumeEvent(eventFactory.createStartElement(name, attributes.iterator(), namespaces.iterator())); consumeEvent(eventFactory.createStartElement(name, attributes.iterator(), namespaces != null ? namespaces.iterator() : null));
} }
@Override @Override
protected void endElementInternal(QName name, SimpleNamespaceContext namespaceContext) throws XMLStreamException { protected void endElementInternal(QName name, SimpleNamespaceContext namespaceContext) throws XMLStreamException {
List namespaces = createNamespaces(namespaceContext); List namespaces = createNamespaces(namespaceContext);
consumeEvent(eventFactory.createEndElement(name, namespaces.iterator())); consumeEvent(eventFactory.createEndElement(name, namespaces != null ? namespaces.iterator() : null));
} }
@Override @Override
@ -128,6 +128,10 @@ class StaxEventContentHandler extends AbstractStaxContentHandler {
/** Creates and returns a list of <code>NameSpace</code> objects from the <code>NamespaceContext</code>. */ /** Creates and returns a list of <code>NameSpace</code> objects from the <code>NamespaceContext</code>. */
private List<Namespace> createNamespaces(SimpleNamespaceContext namespaceContext) { private List<Namespace> createNamespaces(SimpleNamespaceContext namespaceContext) {
if (namespaceContext == null) {
return null;
}
List<Namespace> namespaces = new ArrayList<Namespace>(); List<Namespace> namespaces = new ArrayList<Namespace>();
String defaultNamespaceUri = namespaceContext.getNamespaceURI(XMLConstants.DEFAULT_NS_PREFIX); String defaultNamespaceUri = namespaceContext.getNamespaceURI(XMLConstants.DEFAULT_NS_PREFIX);
if (StringUtils.hasLength(defaultNamespaceUri)) { if (StringUtils.hasLength(defaultNamespaceUri)) {