[FIXED JENKINS-25788] RunMap.remove was always returning false, even …

…when the Run was in fact removed. (cherry picked from commit ce94579) Conflicts: changelog.html
jenkinsci · Dec 9, 2014 · 14d676bb15dbf8ddc3208bd8a80033e831756d49 · 14d676b
1 parent 21a619f
commit 14d676bb15dbf8ddc3208bd8a80033e831756d49
Unified Split

Showing with 18 additions and 4 deletions.

+1 −1 core/src/main/java/jenkins/model/lazy/AbstractLazyLoadRunMap.java

+17 −3 test/src/test/java/hudson/model/RunMapTest.java
diff --git a/core/src/main/java/jenkins/model/lazy/AbstractLazyLoadRunMap.java b/core/src/main/java/jenkins/model/lazy/AbstractLazyLoadRunMap.java
@@ -746,7 +746,7 @@ public synchronized boolean removeValue(R run) {
        entrySet.clearCache();
-  
-        return unwrap(old)!=null;
+  
+        return old != null;
    }
    /**

diff --git a/test/src/test/java/hudson/model/RunMapTest.java b/test/src/test/java/hudson/model/RunMapTest.java
@@ -9,9 +9,6 @@
 import org.jvnet.hudson.test.JenkinsRule;
 import org.jvnet.hudson.test.SleepBuilder;
-  
-/**
-  
- * @author Kohsuke Kawaguchi
-  
- */
 public class RunMapTest {
    @Rule public JenkinsRule r = new JenkinsRule();
@@ -73,4 +70,21 @@ public Object readResolve() {
    private static boolean bombed;
+  
+    @Issue("JENKINS-25788")
+  
+    @Test public void remove() throws Exception {
+  
+        FreeStyleProject p = r.createFreeStyleProject();
+  
+        FreeStyleBuild b1 = r.buildAndAssertSuccess(p);
+  
+        FreeStyleBuild b2 = r.buildAndAssertSuccess(p);
+  
+        RunMap<FreeStyleBuild> runs = p._getRuns();
+  
+        assertEquals(2, runs.size());
+  
+        assertTrue(runs.remove(b1));
+  
+        assertEquals(1, runs.size());
+  
+        assertFalse(runs.remove(b1));
+  
+        assertEquals(1, runs.size());
+  
+        assertTrue(runs.remove(b2));
+  
+        assertEquals(0, runs.size());
+  
+        assertFalse(runs.remove(b2));
+  
+        assertEquals(0, runs.size());
+  
+    }
+  
+
 }