diff options
| author | Gary Benson <gbenson@redhat.com> | 2007-03-09 09:31:18 +0000 |
|---|---|---|
| committer | Gary Benson <gary@gcc.gnu.org> | 2007-03-09 09:31:18 +0000 |
| commit | 8e4425d798eb4970eac12bd1a66011ed94b2509b (patch) | |
| tree | 3dc83187a1ee8ef439d6cde12ff92ae57a5cf118 /libjava/classpath/gnu/xml/dom | |
| parent | bff4b63d31059f3ebf918e70ca00d5eb4dcbc62e (diff) | |
| download | gcc-8e4425d798eb4970eac12bd1a66011ed94b2509b.zip gcc-8e4425d798eb4970eac12bd1a66011ed94b2509b.tar.gz gcc-8e4425d798eb4970eac12bd1a66011ed94b2509b.tar.bz2 | |
re PR xml/30831 (Writing (transforming) XML fails)
2007-03-09 Gary Benson <gbenson@redhat.com>
Chris Burdess <dog@gnu.org>
PR classpath/30831
* gnu/xml/dom/ls/SAXEventSink.java: Only set extended document
properties when reader is available.
Co-Authored-By: Chris Burdess <dog@gnu.org>
From-SVN: r122743
Diffstat (limited to 'libjava/classpath/gnu/xml/dom')
| -rw-r--r-- | libjava/classpath/gnu/xml/dom/ls/SAXEventSink.java | 51 |
1 files changed, 27 insertions, 24 deletions
diff --git a/libjava/classpath/gnu/xml/dom/ls/SAXEventSink.java b/libjava/classpath/gnu/xml/dom/ls/SAXEventSink.java index 2855400..364c576 100644 --- a/libjava/classpath/gnu/xml/dom/ls/SAXEventSink.java +++ b/libjava/classpath/gnu/xml/dom/ls/SAXEventSink.java @@ -144,37 +144,40 @@ public class SAXEventSink final String PROPERTIES = "http://xml.org/sax/properties/"; final String GNU_PROPERTIES = "http://gnu.org/sax/properties/"; - boolean standalone = reader.getFeature(FEATURES + "is-standalone"); - doc.setXmlStandalone(standalone); - try - { - String version = (String) reader.getProperty(PROPERTIES + - "document-xml-version"); - doc.setXmlVersion(version); - } - catch (SAXNotRecognizedException e) - { - } - catch (SAXNotSupportedException e) + if (reader != null) { + boolean standalone = reader.getFeature(FEATURES + "is-standalone"); + doc.setXmlStandalone(standalone); + try + { + String version = (String) reader.getProperty(PROPERTIES + + "document-xml-version"); + doc.setXmlVersion(version); + } + catch (SAXNotRecognizedException e) + { + } + catch (SAXNotSupportedException e) + { + } + try + { + String encoding = (String) reader.getProperty(GNU_PROPERTIES + + "document-xml-encoding"); + doc.setXmlEncoding(encoding); + } + catch (SAXNotRecognizedException e) + { + } + catch (SAXNotSupportedException e) + { + } } if (locator != null && locator instanceof Locator2) { String encoding = ((Locator2) locator).getEncoding(); doc.setInputEncoding(encoding); } - try - { - String encoding = (String) reader.getProperty(GNU_PROPERTIES + - "document-xml-encoding"); - doc.setXmlEncoding(encoding); - } - catch (SAXNotRecognizedException e) - { - } - catch (SAXNotSupportedException e) - { - } } public void endDocument() |