diff options
| author |  shahan <shahan@google.com> | 2018-06-27 16:25:59 -0700 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-06-27 16:27:24 -0700 |
| commit | 7bcb8eda43aad9318415c2be0596edfaac52bb9d (patch) | |
| tree | 52ec290d8cef3a43d4acc6379734411469b3f1df /src/main/java/com/google/devtools | |
| parent | f59a033e1507cb6249dcbf3908f344a9ad546e3d (diff) | |
Handles null value in createAggregatingValue env.getValues call.
PiperOrigin-RevId: 202389874
Diffstat (limited to 'src/main/java/com/google/devtools')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/skyframe/ArtifactFunction.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/ArtifactFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/ArtifactFunction.java index c153135c09..a084c3d200 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/ArtifactFunction.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/ArtifactFunction.java @@ -271,6 +271,7 @@ class ArtifactFunction implements SkyFunction { return FileArtifactValue.createNormalFile(data); } + @Nullable private static AggregatingArtifactValue createAggregatingValue( Artifact artifact, ActionAnalysisMetadata action, @@ -283,7 +284,9 @@ class ArtifactFunction implements SkyFunction { env.getValues(ArtifactSkyKey.mandatoryKeys(action.getInputs())).entrySet()) { Artifact input = ArtifactSkyKey.artifact(entry.getKey()); SkyValue inputValue = entry.getValue(); - Preconditions.checkNotNull(inputValue, "%s has null dep %s", artifact, input); + if (inputValue == null) { + return null; + } if (inputValue instanceof FileArtifactValue) { inputs.add(Pair.of(input, (FileArtifactValue) inputValue)); } else if (inputValue instanceof TreeArtifactValue) { |