From 4d2c3596062401b021aab16e73c5b64804e58612 Mon Sep 17 00:00:00 2001 From: Arjen Poutsma Date: Wed, 6 Feb 2008 02:38:34 +0000 Subject: [PATCH] SWS-265 --- .../springframework/xml/stream/StaxEventXmlReader.java | 8 ++++++-- .../springframework/xml/stream/StaxStreamXmlReader.java | 3 +++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/xml/src/main/java/org/springframework/xml/stream/StaxEventXmlReader.java b/xml/src/main/java/org/springframework/xml/stream/StaxEventXmlReader.java index fe7ef0a0..0cba124a 100644 --- a/xml/src/main/java/org/springframework/xml/stream/StaxEventXmlReader.java +++ b/xml/src/main/java/org/springframework/xml/stream/StaxEventXmlReader.java @@ -223,8 +223,12 @@ public class StaxEventXmlReader extends AbstractStaxXmlReader { if (namespace == null || !hasNamespacesFeature()) { namespace = ""; } - attributes.addAttribute(namespace, qName.getLocalPart(), QNameUtils.toQualifiedName(qName), - attribute.getDTDType(), attribute.getValue()); + String type = attribute.getDTDType(); + if (type == null) { + type = "CDATA"; + } + attributes.addAttribute(namespace, qName.getLocalPart(), QNameUtils.toQualifiedName(qName), type, + attribute.getValue()); } if (hasNamespacePrefixesFeature()) { for (Iterator i = event.getNamespaces(); i.hasNext();) { diff --git a/xml/src/main/java/org/springframework/xml/stream/StaxStreamXmlReader.java b/xml/src/main/java/org/springframework/xml/stream/StaxStreamXmlReader.java index 08dc26e3..9613a363 100644 --- a/xml/src/main/java/org/springframework/xml/stream/StaxStreamXmlReader.java +++ b/xml/src/main/java/org/springframework/xml/stream/StaxStreamXmlReader.java @@ -196,6 +196,9 @@ public class StaxStreamXmlReader extends AbstractStaxXmlReader { namespace = ""; } String type = reader.getAttributeType(i); + if (type == null) { + type = "CDATA"; + } attributes.addAttribute(namespace, reader.getAttributeLocalName(i), QNameUtils.toQualifiedName(reader.getAttributeName(i)), type, reader.getAttributeValue(i)); }