From 91b908c9675b061ea82a40913e9cf636112ac335 Mon Sep 17 00:00:00 2001 From: gary Date: Fri, 9 Mar 2007 09:31:18 +0000 Subject: 2007-03-09 Gary Benson Chris Burdess PR classpath/30831 * gnu/xml/dom/ls/SAXEventSink.java: Only set extended document properties when reader is available. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@122743 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/classpath/gnu/xml/dom/ls/SAXEventSink.java | 51 ++++++++++++---------- 1 file changed, 27 insertions(+), 24 deletions(-) (limited to 'libjava/classpath/gnu/xml/dom/ls/SAXEventSink.java') diff --git a/libjava/classpath/gnu/xml/dom/ls/SAXEventSink.java b/libjava/classpath/gnu/xml/dom/ls/SAXEventSink.java index 285540060d9..364c576d196 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() -- cgit v1.2.3