Author: mrglavas
Date: Sat Jul 7 23:41:49 2012
New Revision: 1358676
URL: http://svn.apache.org/viewvc?rev=1358676&view=rev
Log:
Fixing an NPE.
Modified:
xerces/java/trunk/src/org/apache/xerces/util/StAXInputSource.java
Modified: xerces/java/trunk/src/org/apache/xerces/util/StAXInputSource.java
URL:
http://svn.apache.org/viewvc/xerces/java/trunk/src/org/apache/xerces/util/StAXInputSource.java?rev=1358676&r1=1358675&r2=1358676&view=diff
==============================================================================
--- xerces/java/trunk/src/org/apache/xerces/util/StAXInputSource.java (original)
+++ xerces/java/trunk/src/org/apache/xerces/util/StAXInputSource.java Sat Jul
7 23:41:49 2012
@@ -39,7 +39,7 @@ public final class StAXInputSource exten
}
public StAXInputSource(XMLStreamReader source, boolean
consumeRemainingContent) {
- super(null, source.getLocation().getSystemId(), null);
+ super(null, getStreamReaderSystemId(source), null);
if (source == null) {
throw new IllegalArgumentException("XMLStreamReader parameter
cannot be null.");
}
@@ -78,6 +78,13 @@ public final class StAXInputSource exten
throw new UnsupportedOperationException("Cannot set the system ID on a
StAXInputSource");
}
+ private static String getStreamReaderSystemId(XMLStreamReader reader) {
+ if (reader != null) {
+ return reader.getLocation().getSystemId();
+ }
+ return null;
+ }
+
private static String getEventReaderSystemId(XMLEventReader reader) {
try {
if (reader != null) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
