aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Kristina Chodorow <kchodorow@google.com>2016-03-30 15:16:21 +0000
committerGravatar Klaus Aehlig <aehlig@google.com>2016-03-30 15:26:02 +0000
commit787abf9ac25ef954f9df70c25c74995ac4159ef6 (patch)
treef4d9914fef2d90d5cb33f6e85016e783ce33a287
parent0e7d35c1fa2b4e8590d616bf7226382cbe5b0438 (diff)
Fix NPE when Maven model is unresolvable
-- MOS_MIGRATED_REVID=118574071
-rw-r--r--src/tools/generate_workspace/src/main/java/com/google/devtools/build/workspace/maven/Resolver.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/tools/generate_workspace/src/main/java/com/google/devtools/build/workspace/maven/Resolver.java b/src/tools/generate_workspace/src/main/java/com/google/devtools/build/workspace/maven/Resolver.java
index 184e2559b4..12fc4f9176 100644
--- a/src/tools/generate_workspace/src/main/java/com/google/devtools/build/workspace/maven/Resolver.java
+++ b/src/tools/generate_workspace/src/main/java/com/google/devtools/build/workspace/maven/Resolver.java
@@ -200,6 +200,9 @@ public class Resolver {
*/
private void resolveSourceLocations(FileModelSource fileModelSource) {
Model model = modelResolver.getRawModel(fileModelSource, handler);
+ if (model == null) {
+ return;
+ }
// Self.
Parent parent = model.getParent();