summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--gnu/xml/transform/SAXSerializer.java3
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index f26209ebe..4feb04167 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-10-17 Jeremy Singer <Jeremy.Singer@glasgow.ac.uk>
+
+ PR classpath/54960
+ * gnu/xml/transform/SAXSerializer.java:
+ (getValue(String)): Avoid NullPointerException.
+
2012-10-26 Andrew John Hughes <gnu_andrew@member.fsf.org>
* native/jni/midi-dssi/gnu_javax_sound_midi_dssi_DSSISynthesizer.c:
diff --git a/gnu/xml/transform/SAXSerializer.java b/gnu/xml/transform/SAXSerializer.java
index 2bd1f97ab..3ea423410 100644
--- a/gnu/xml/transform/SAXSerializer.java
+++ b/gnu/xml/transform/SAXSerializer.java
@@ -200,7 +200,8 @@ class SAXSerializer
public String getValue(String qName)
{
- return attrs.getNamedItem(qName).getNodeValue();
+ Attr attr = (Attr) attrs.getNamedItem(qName);
+ return (attr == null) ? null : attr.getNodeValue();
}
void serialize(Node node, ContentHandler ch, LexicalHandler lh)