[FIXED JENKINS-25655] Incorrect caching from entrySet sometimes cause…

…d incorrect results. Caused a failure in hudson.plugins.promoted_builds.conditions.ManualConditionTest.testManualPromotionProcessViaWebClient when run against 1.580.1. (cherry picked from commit b76e7bf)
jenkinsci · Dec 21, 2014 · bd0453f · bd0453f
1 parent be34b67
commit bd0453f
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 0 deletions.
diff --git a/core/src/main/java/jenkins/model/lazy/AbstractLazyLoadRunMap.java b/core/src/main/java/jenkins/model/lazy/AbstractLazyLoadRunMap.java
@@ -585,6 +585,8 @@ public synchronized R put(Integer key, R r) {
             numberOnDisk = a;
         }
 
+        entrySet.clearCache();
+
         return unwrap(old);
     }
 
@@ -742,6 +744,8 @@ public synchronized boolean removeValue(R run) {
         BuildReference<R> old = copy.byId.remove(getIdOf(run));
         this.index = copy;
 
+        entrySet.clearCache();
+
         return unwrap(old)!=null;
     }
 

diff --git a/core/src/main/java/jenkins/model/lazy/LazyLoadRunMapEntrySet.java b/core/src/main/java/jenkins/model/lazy/LazyLoadRunMapEntrySet.java
@@ -32,6 +32,10 @@ private synchronized Set<Entry<Integer,R>> all() {
         return all;
     }
 
+    synchronized void clearCache() {
+        all = null;
+    }
+
     @Override
     public int size() {
         return all().size();

diff --git a/core/src/test/java/jenkins/model/lazy/AbstractLazyLoadRunMapTest.java b/core/src/test/java/jenkins/model/lazy/AbstractLazyLoadRunMapTest.java
@@ -414,6 +414,13 @@ public void entrySetSize() {
         assertEquals(0, b.entrySet().size());
     }
 
+    @Issue("JENKINS-25655")
+    @Test public void entrySetChanges() {
+        assertEquals(3, a.entrySet().size());
+        a.put(new Build(7, "D"));
+        assertEquals(4, a.entrySet().size());
+    }
+
     @Issue("JENKINS-18065")
     @Test
     public void entrySetContains() {