Author: vhennebert
Date: Mon Jul 28 21:03:59 2014
New Revision: 1614177
URL: http://svn.apache.org/r1614177
Log:
BATIK-946: Account for possibly null XML_PARSER_VALIDATING key
Modified:
xmlgraphics/batik/trunk/sources/org/apache/batik/transcoder/XMLAbstractTranscoder.java
Modified:
xmlgraphics/batik/trunk/sources/org/apache/batik/transcoder/XMLAbstractTranscoder.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/transcoder/XMLAbstractTranscoder.java?rev=1614177&r1=1614176&r2=1614177&view=diff
==============================================================================
---
xmlgraphics/batik/trunk/sources/org/apache/batik/transcoder/XMLAbstractTranscoder.java
(original)
+++
xmlgraphics/batik/trunk/sources/org/apache/batik/transcoder/XMLAbstractTranscoder.java
Mon Jul 28 21:03:59 2014
@@ -85,7 +85,7 @@ public abstract class XMLAbstractTransco
(String)hints.get(KEY_DOCUMENT_ELEMENT);
DOMImplementation domImpl =
(DOMImplementation)hints.get(KEY_DOM_IMPLEMENTATION);
-
+
if (parserClassname == null) {
parserClassname =
XMLResourceDescriptor.getXMLParserClassName();
}
@@ -106,9 +106,9 @@ public abstract class XMLAbstractTransco
}
// parse the XML document
DocumentFactory f = createDocumentFactory(domImpl,
parserClassname);
- boolean b =
- ((Boolean)hints.get(KEY_XML_PARSER_VALIDATING)).booleanValue();
- f.setValidating(b);
+ Object xmlParserValidating = hints.get(KEY_XML_PARSER_VALIDATING);
+ boolean validating = xmlParserValidating != null && ((Boolean)
xmlParserValidating).booleanValue();
+ f.setValidating(validating);
try {
if (input.getInputStream() != null) {
document = f.createDocument(namespaceURI,
@@ -129,7 +129,7 @@ public abstract class XMLAbstractTransco
document = f.createDocument(namespaceURI,
documentElement,
uri);
- }
+ }
} catch (DOMException ex) {
handler.fatalError(new TranscoderException(ex));
} catch (IOException ex) {
