diff options
author | Rumou Duan <rduan@google.com> | 2016-10-19 19:28:06 +0000 |
---|---|---|
committer | Philipp Wollermann <philwo@google.com> | 2016-10-19 19:44:52 +0000 |
commit | 9ad28cd6001feb5dd8afda5878ebacfe25efe254 (patch) | |
tree | 7fd858ca933ef88504a5d4ded21bde7e655fa531 /src/main/java/com/google/devtools/build/lib/skyframe/FilesystemValueChecker.java | |
parent | ca9a425a4825b5fd9892ec55051e7ffb2025bea2 (diff) |
Proper action output checks for TreeArtifacts. Instead of crashing Bazel, we now handle failed TreeArtifact output checks gracefully.
--
MOS_MIGRATED_REVID=136627086
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/skyframe/FilesystemValueChecker.java')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/skyframe/FilesystemValueChecker.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/FilesystemValueChecker.java b/src/main/java/com/google/devtools/build/lib/skyframe/FilesystemValueChecker.java index 4b9263e0e6..9a94f3f30e 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/FilesystemValueChecker.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/FilesystemValueChecker.java @@ -30,7 +30,6 @@ import com.google.devtools.build.lib.concurrent.ThrowableRecordingRunnableWrappe import com.google.devtools.build.lib.profiler.AutoProfiler; import com.google.devtools.build.lib.profiler.AutoProfiler.ElapsedTimeReceiver; import com.google.devtools.build.lib.skyframe.SkyValueDirtinessChecker.DirtyResult; -import com.google.devtools.build.lib.skyframe.TreeArtifactValue.TreeArtifactException; import com.google.devtools.build.lib.util.LoggingUtil; import com.google.devtools.build.lib.util.Pair; import com.google.devtools.build.lib.util.Preconditions; @@ -376,7 +375,7 @@ public class FilesystemValueChecker { Set<PathFragment> currentDirectoryValue = TreeArtifactValue.explodeDirectory(artifact); Set<PathFragment> valuePaths = value.getChildPaths(); return !currentDirectoryValue.equals(valuePaths); - } catch (IOException | TreeArtifactException e) { + } catch (IOException e) { return true; } } |