commit ddb7c2721d461d54fdb9dbf013f1f57fb6c44efd
author Ulf Adams <ulfjack@google.com> Tue Feb 09 18:01:37 2016 +0000
committer Dmitry Lomov <dslomov@google.com> Wed Feb 10 10:22:38 2016 +0000
tree 881170d64034726546b7eb824fb01e047178bbbd
parent d2eaca660e8b06dc38f74fdf78501c6e631abe0e

Fix NPE in TestsInSuiteFunction.

Note that this only affects the new Skyframe-based implementation of the
LoadingPhaseRunner, which isn't live yet.

--
MOS_MIGRATED_REVID=114230017

src/main/java/com/google/devtools/build/lib/skyframe/TestsInSuiteFunction.java

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/TestsInSuiteFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/TestsInSuiteFunction.java
index 3c559de..4556c76 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/TestsInSuiteFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/TestsInSuiteFunction.java
@@ -116,6 +116,9 @@
       if (TargetUtils.isTestSuiteRule(suite)) {
         TestsInSuiteValue value =
             (TestsInSuiteValue) env.getValue(TestsInSuiteValue.key(suite, strict));
+        if (value == null) {
+          continue;
+        }
         builder.merge(value.getTargets());
       }
     }