Spring/spring-ws
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SWS-329

Browse Source
This commit is contained in:
Arjen Poutsma
2008-05-06 11:28:16 +00:00
parent bb84529d7e
commit cf9515e269
1 changed files with 22 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
core/src/main/java/org/springframework/ws/soap/saaj/support/SaajContentHandler.java
View File

@@ -92,7 +92,9 @@ public class SaajContentHandler implements ContentHandler {
for (Iterator iterator = namespaces.keySet().iterator(); iterator.hasNext();) {
String namespacePrefix = (String) iterator.next();
String namespaceUri = (String) namespaces.get(namespacePrefix);
child.addNamespaceDeclaration(namespacePrefix, namespaceUri);
if (!findParentNamespaceDeclaration(child, namespacePrefix, namespaceUri)) {
child.addNamespaceDeclaration(namespacePrefix, namespaceUri);
}
}
element = child;
}
@@ -101,6 +103,25 @@ public class SaajContentHandler implements ContentHandler {
}
}
private boolean findParentNamespaceDeclaration(SOAPElement element, String prefix, String namespaceUri) {
String result = element.getNamespaceURI(prefix);
if (namespaceUri.equals(result)) {
return true;
}
else {
try {
SOAPElement parent = element.getParentElement();
if (parent != null) {
return findParentNamespaceDeclaration(parent, prefix, namespaceUri);
}
}
catch (UnsupportedOperationException ex) {
// ignore
}
return false;
}
}
public void endElement(String uri, String localName, String qName) throws SAXException {
Assert.isTrue(localName.equals(element.getElementName().getLocalName()), "Invalid element on stack");
Assert.isTrue(uri.equals(element.getElementName().getURI()), "Invalid element on stack");