From 14d676bb15dbf8ddc3208bd8a80033e831756d49 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Tue, 9 Dec 2014 15:24:06 -0500 Subject: [PATCH] [FIXED JENKINS-25788] RunMap.remove was always returning false, even when the Run was in fact removed. (cherry picked from commit ce94579c50621990517c86120236ee9a1d0490da) Conflicts: changelog.html --- .../model/lazy/AbstractLazyLoadRunMap.java | 2 +- .../test/java/hudson/model/RunMapTest.java | 20 ++++++++++++++++--- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/core/src/main/java/jenkins/model/lazy/AbstractLazyLoadRunMap.java b/core/src/main/java/jenkins/model/lazy/AbstractLazyLoadRunMap.java index f299d598d0..3085d8fb82 100644 --- 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 abstract class AbstractLazyLoadRunMap extends AbstractMap i 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 index a6b45fe602..13d49dcd60 100644 --- 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.Issue; 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 class RunMapTest { 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 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()); + } + }