aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/main/java/com/google/devtools/build/skyframe/ParallelEvaluator.java
diff options
context:
space:
mode:
authorGravatar Michajlo Matijkiw <michajlo@google.com>2015-10-15 20:54:33 +0000
committerGravatar Laszlo Csomor <laszlocsomor@google.com>2015-10-16 07:40:24 +0000
commit6630426fb6b2380a8bf78ca77b7f42606b33702c (patch)
tree50b8984416f051a9f326c8f501bc02e6980c2ffa /src/main/java/com/google/devtools/build/skyframe/ParallelEvaluator.java
parent629a7c4d97efbb4b2001650f30f9168968ffa9e7 (diff)
Move to using "well-known" SkyFunctionNames in tests exercising graph
-- MOS_MIGRATED_REVID=105539869
Diffstat (limited to 'src/main/java/com/google/devtools/build/skyframe/ParallelEvaluator.java')
-rw-r--r--src/main/java/com/google/devtools/build/skyframe/ParallelEvaluator.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/main/java/com/google/devtools/build/skyframe/ParallelEvaluator.java b/src/main/java/com/google/devtools/build/skyframe/ParallelEvaluator.java
index 59ff33ad48..6dc31eeaf6 100644
--- a/src/main/java/com/google/devtools/build/skyframe/ParallelEvaluator.java
+++ b/src/main/java/com/google/devtools/build/skyframe/ParallelEvaluator.java
@@ -1513,8 +1513,8 @@ public final class ParallelEvaluator implements Evaluator {
// graph stack.
while (!toVisit.isEmpty()) {
SkyKey key = toVisit.pop();
- NodeEntry entry = graph.get(key);
+ NodeEntry entry;
if (key == CHILDREN_FINISHED) {
// A marker node means we are done with all children of a node. Since all nodes have
// errors, we must have found errors in the children when that happens.
@@ -1548,6 +1548,8 @@ public final class ParallelEvaluator implements Evaluator {
SkyFunctionEnvironment env = new SkyFunctionEnvironment(key, directDeps, visitor);
env.setError(ErrorInfo.fromChildErrors(key, errorDeps));
env.commit(/*enqueueParents=*/false);
+ } else {
+ entry = graph.get(key);
}
Preconditions.checkNotNull(entry, key);