Fix NPE when passing null Location to XMLStreamException.

PiperOrigin-RevId: 163291269

1 files changed, 6 insertions, 1 deletions

diff --git a/src/tools/android/java/com/google/devtools/build/android/DataValueFileWithIds.java b/src/tools/android/java/com/google/devtools/build/android/DataValueFileWithIds.java
index 177eaf64a7..4cbb1b13f9 100644
--- a/src/tools/android/java/com/google/devtools/build/android/DataValueFileWithIds.java
+++ b/src/tools/android/java/com/google/devtools/build/android/DataValueFileWithIds.java
@@ -70,7 +70,12 @@ public class DataValueFileWithIds {
       }
       eventReader.close();
     } catch (XMLStreamException e) {
-      throw new XMLStreamException(source + ": " + e.getMessage(), e.getLocation(), e);
+      if (e.getLocation() != null) {
+        throw new XMLStreamException(source + ": " + e.getMessage(), e.getLocation(), e);
+      } else {
+        throw new XMLStreamException(source + ": " + e.getMessage(), e);
+      }
+
     } catch (RuntimeException e) {
       throw new RuntimeException("Error parsing " + source, e);
     }