commit 17bedb8e38d01c512a0601a8f06e9caa1a78c14e
author ajurkowski <ajurkowski@google.com> Wed Jul 01 12:57:24 2020 -0700
committer Copybara-Service <copybara-worker@google.com> Wed Jul 01 12:58:23 2020 -0700
tree bace8318d8dced4c5f16d73834d5c468098fdaa3
parent 6840a88a8821bf93c35de99fde29b91eea4656f2

Always create `ImmutableMap` in `getMapForConsistencyCheck`.

Fix an error-prone warning about
`ActionTemplateExpansionFunction.getMapForConsistencyCheck` which returns
mutable or immutable map depending on the code path.

PiperOrigin-RevId: 319280692

src/main/java/com/google/devtools/build/lib/skyframe/ActionTemplateExpansionFunction.java

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/ActionTemplateExpansionFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/ActionTemplateExpansionFunction.java
index e5499a6..2cf032d 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/ActionTemplateExpansionFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/ActionTemplateExpansionFunction.java
@@ -171,7 +171,7 @@
     return generatingActions;
   }
 
-  private static Map<Artifact, ActionAnalysisMetadata> getMapForConsistencyCheck(
+  private static ImmutableMap<Artifact, ActionAnalysisMetadata> getMapForConsistencyCheck(
       List<? extends ActionAnalysisMetadata> actions) {
     if (actions.isEmpty()) {
       return ImmutableMap.of();
@@ -183,7 +183,7 @@
         result.put(output, action);
       }
     }
-    return result;
+    return ImmutableMap.copyOf(result);
   }
 
   /**