svn commit: r1759855 - /uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiCasDeserializer.java

[sc...@apache.org]

Author: schor
Date: Thu Sep  8 15:42:06 2016
New Revision: 1759855

URL: http://svn.apache.org/viewvc?rev=1759855&view=rev
Log:
[UIMA-4674] avoid npe when locator value not available

Modified:
    uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiCasDeserializer.java

Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiCasDeserializer.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiCasDeserializer.java?rev=1759855&r1=1759854&r2=1759855&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiCasDeserializer.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiCasDeserializer.java Thu Sep  8 15:42:06 2016
@@ -628,8 +628,8 @@ public class XmiCasDeserializer {
       this.deferredFsElement = new OotsElementData(
           idStr, 
           new XmlElementName(nameSpaceURI, localName, qualifiedName),
-          locator.getLineNumber(),
-          locator.getColumnNumber());
+          (locator == null) ? 0 : locator.getLineNumber(),
+          (locator == null) ? 0 : locator.getColumnNumber());
       
       deferredFSs.add(this.deferredFsElement);
       // This next call isn't about oots data, it's reusing that to store the attributes with the deferred thing.
@@ -1871,7 +1871,7 @@ public class XmiCasDeserializer {
      */
     @Override
     public void setDocumentLocator(Locator loc) {
-      // System.out.println("Setting document locator.");
+//       System.out.println("debug  DEBUG  Setting document locator.");
       this.locator = loc;
     }