Author: mrglavas Date: Sat Jul 7 23:42:08 2012 New Revision: 1358677 URL: http://svn.apache.org/viewvc?rev=1358677&view=rev Log: Fixing an NPE.
Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/util/StAXInputSource.java Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/util/StAXInputSource.java URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/util/StAXInputSource.java?rev=1358677&r1=1358676&r2=1358677&view=diff ============================================================================== --- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/util/StAXInputSource.java (original) +++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/util/StAXInputSource.java Sat Jul 7 23:42:08 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: commits-unsubscr...@xerces.apache.org For additional commands, e-mail: commits-h...@xerces.apache.org