commit e03758bb808f37f7de9f07a8eb51081bbe95ae8b
author Philipp Wollermann <philwo@google.com> Mon Jun 15 08:10:47 2015 +0000
committer Han-Wen Nienhuys <hanwen@google.com> Mon Jun 15 10:52:04 2015 +0000
tree a61794532b6a9042b362012fa990021484deba70
parent e753ecf58281ad33dcf827462fce4f16596666e7

Fix a bug in the ActionCacheChecker where the code that intended to remove outdated keys from the cache actually removed the correct one, so the cache never got cleaned up.

--
MOS_MIGRATED_REVID=95986001

src/main/java/com/google/devtools/build/lib/actions/ActionCacheChecker.java

diff --git a/src/main/java/com/google/devtools/build/lib/actions/ActionCacheChecker.java b/src/main/java/com/google/devtools/build/lib/actions/ActionCacheChecker.java
index c9c1ecb..1861988 100644
--- a/src/main/java/com/google/devtools/build/lib/actions/ActionCacheChecker.java
+++ b/src/main/java/com/google/devtools/build/lib/actions/ActionCacheChecker.java
@@ -224,7 +224,7 @@
       // Remove old records from the cache if they used different key.
       String execPath = output.getExecPathString();
       if (!key.equals(execPath)) {
-        actionCache.remove(key);
+        actionCache.remove(execPath);
       }
       if (!metadataHandler.artifactOmitted(output)) {
         // Output files *must* exist and be accessible after successful action execution.