diff --git a/core/src/main/java/jenkins/util/xstream/XStreamDOM.java b/core/src/main/java/jenkins/util/xstream/XStreamDOM.java index fc527d666e..9b1a6741c3 100644 --- a/core/src/main/java/jenkins/util/xstream/XStreamDOM.java +++ b/core/src/main/java/jenkins/util/xstream/XStreamDOM.java @@ -28,6 +28,7 @@ import com.thoughtworks.xstream.converters.Converter; import com.thoughtworks.xstream.converters.ErrorWriter; import com.thoughtworks.xstream.converters.MarshallingContext; import com.thoughtworks.xstream.converters.UnmarshallingContext; +import com.thoughtworks.xstream.io.AttributeNameIterator; import com.thoughtworks.xstream.io.HierarchicalStreamReader; import com.thoughtworks.xstream.io.HierarchicalStreamWriter; import com.thoughtworks.xstream.io.xml.AbstractXmlReader; @@ -137,18 +138,6 @@ public class XStreamDOM { return attributes[index*2+1]; } - public Iterator getAttributeNames() { - return new AbstractList() { - public String get(int index) { - return getAttributeName(index); - } - - public int size() { - return getAttributeCount(); - } - }.iterator(); - } - public String getValue() { return value; } @@ -250,7 +239,7 @@ public class XStreamDOM { } public Iterator getAttributeNames() { - return current().node.getAttributeNames(); + return new AttributeNameIterator(this); } public void appendErrors(ErrorWriter errorWriter) { @@ -275,7 +264,7 @@ public class XStreamDOM { } public String getNodeName() { - return current().node.tagName; + return unescapeXmlName(current().node.tagName); } public String getValue() { @@ -295,7 +284,7 @@ public class XStreamDOM { } public String getAttributeName(int index) { - return current().node.getAttributeName(index); + return unescapeXmlName(current().node.getAttributeName(index)); } } diff --git a/core/src/test/java/jenkins/util/xstream/XStreamDOMTest.java b/core/src/test/java/jenkins/util/xstream/XStreamDOMTest.java index c3b623ef2b..5270a88886 100644 --- a/core/src/test/java/jenkins/util/xstream/XStreamDOMTest.java +++ b/core/src/test/java/jenkins/util/xstream/XStreamDOMTest.java @@ -87,4 +87,14 @@ public class XStreamDOMTest extends TestCase { String[] out = dom.unmarshal(xs); assertEquals(in.length, out.length); } + + public void testNameEscape() { + Object o = new Name_That_Gets_Escaped(); + XStreamDOM dom = XStreamDOM.from(xs, o); + System.out.println(xs.toXML(dom)); + Object out = dom.unmarshal(xs); + assertEquals(o.getClass(),out.getClass()); + } + + public static class Name_That_Gets_Escaped {} }