1 files changed, 5 insertions, 4 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/ActionMetadataHandler.java b/src/main/java/com/google/devtools/build/lib/skyframe/ActionMetadataHandler.java
index 3230af8e32..7275222664 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/ActionMetadataHandler.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/ActionMetadataHandler.java
@@ -35,7 +35,6 @@ import com.google.devtools.build.lib.vfs.Symlinks;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.util.Arrays;
-import java.util.Collection;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
@@ -282,11 +281,13 @@ public class ActionMetadataHandler implements MetadataHandler {
   }
 
   @Override
-  public void discardMetadata(Collection<Artifact> artifactList) {
+  public void discardOutputMetadata() {
     Preconditions.checkState(injectedArtifacts.isEmpty(),
         "Artifacts cannot be injected before action execution: %s", injectedArtifacts);
-    outputArtifactData.keySet().removeAll(artifactList);
-    additionalOutputData.keySet().removeAll(artifactList);
+    Preconditions.checkState(omittedOutputs.isEmpty(),
+        "Artifacts cannot be marked omitted before action execution: %s", omittedOutputs);
+    outputArtifactData.clear();
+    additionalOutputData.clear();
   }
 
   @Override