commit 4aa76cc73822f5e6a7980433148289b783f31e81
author Damien Martin-Guillerez <dmarting@google.com> Tue Feb 16 08:28:30 2016 +0000
committer Damien Martin-Guillerez <dmarting@google.com> Tue Feb 16 09:41:59 2016 +0000
tree ff60e206d04849bfb6ed96576fbdba19ce0bbbc6
parent 6b6c6730afb1b936b8e9b88fd746bfa41605fbe8

Fixes NullPointerException in pkgcaches_test on ci.bazel.io

Fixes #879.

--
MOS_MIGRATED_REVID=114728312

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

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/ExternalFilesHelper.java b/src/main/java/com/google/devtools/build/lib/skyframe/ExternalFilesHelper.java
index 4bf976a..6126197 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/ExternalFilesHelper.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/ExternalFilesHelper.java
@@ -85,9 +85,11 @@
 
     // The outputBase may be null if we're not actually running a build.
     Path outputBase = pkgLocator.get().getOutputBase();
-    Path relativeExternal = pkgLocator
-        .get().getOutputBase().getRelative(Label.EXTERNAL_PATH_PREFIX);
-    if (outputBase != null && !rootedPath.asPath().startsWith(relativeExternal)) {
+    if (outputBase == null) {
+      return;
+    }
+    Path relativeExternal = outputBase.getRelative(Label.EXTERNAL_PATH_PREFIX);
+    if (!rootedPath.asPath().startsWith(relativeExternal)) {
       return;
     }