Author: dkulp
Date: Mon Oct 3 20:32:09 2011
New Revision: 1178559
URL: http://svn.apache.org/viewvc?rev=1178559&view=rev
Log:
[NEETHI-13] Fix potential exception from invalid qnames
Modified:
webservices/commons/trunk/modules/neethi/src/main/java/org/apache/neethi/builders/converters/AbstractDOMConverter.java
Modified:
webservices/commons/trunk/modules/neethi/src/main/java/org/apache/neethi/builders/converters/AbstractDOMConverter.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/neethi/src/main/java/org/apache/neethi/builders/converters/AbstractDOMConverter.java?rev=1178559&r1=1178558&r2=1178559&view=diff
==============================================================================
---
webservices/commons/trunk/modules/neethi/src/main/java/org/apache/neethi/builders/converters/AbstractDOMConverter.java
(original)
+++
webservices/commons/trunk/modules/neethi/src/main/java/org/apache/neethi/builders/converters/AbstractDOMConverter.java
Mon Oct 3 20:32:09 2011
@@ -40,7 +40,11 @@ public abstract class AbstractDOMConvert
public QName getQName(Element s) {
- return new QName(s.getNamespaceURI(), s.getLocalName());
+ String name = s.getLocalName();
+ if (name == null) {
+ name = s.getTagName();
+ }
+ return new QName(s.getNamespaceURI(), name);
}
public Map<QName, String> getAttributes(Element s) {
@@ -48,7 +52,11 @@ public abstract class AbstractDOMConvert
NamedNodeMap attrs = s.getAttributes();
for (int x = 0; x < attrs.getLength(); x++) {
Attr attr = (Attr)attrs.item(x);
- mp.put(new QName(attr.getNamespaceURI(), attr.getLocalName()),
attr.getValue());
+ String name = attr.getLocalName();
+ if (name == null) {
+ name = attr.getName();
+ }
+ mp.put(new QName(attr.getNamespaceURI(), name), attr.getValue());
}
return mp;
}