Fix WORKSPACE file existence hermeticity

-- MOS_MIGRATED_REVID=93901785
murugamsm · May 18, 2015 · 88311f8 · 88311f8
1 parent 3e66823
commit 88311f8
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/WorkspaceFileFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/WorkspaceFileFunction.java
@@ -71,7 +71,8 @@ public class WorkspaceFileFunction implements SkyFunction {
   public SkyValue compute(SkyKey skyKey, Environment env) throws WorkspaceFileFunctionException,
       InterruptedException {
     RootedPath workspaceRoot = (RootedPath) skyKey.argument();
-    if (env.getValue(FileValue.key(workspaceRoot)) == null) {
+    FileValue workspaceFileValue = (FileValue) env.getValue(FileValue.key(workspaceRoot));
+    if (workspaceFileValue == null) {
       return null;
     }
 
@@ -85,7 +86,7 @@ public SkyValue compute(SkyKey skyKey, Environment env) throws WorkspaceFileFunc
       }
       parseWorkspaceFile(installDir.getRelative(workspaceFile), builder);
     }
-    if (!repoWorkspace.exists()) {
+    if (!workspaceFileValue.exists()) {
       return new PackageValue(builder.build());
     }
     parseWorkspaceFile(repoWorkspace, builder);