diff --git a/changelog.html b/changelog.html
index 32d47a8551..9f4ae7f4fb 100644
--- a/changelog.html
+++ b/changelog.html
@@ -86,6 +86,9 @@ Upcoming changes
Suppress fingerprint link if fingerprint record isn't available.
(issue 21818)
+
+ Job hangs if one of multiple triggered builds was aborted
+ (issue 21932)
diff --git a/core/src/main/java/hudson/model/Queue.java b/core/src/main/java/hudson/model/Queue.java
index 5bc7c18ae2..17b18f7a79 100644
--- a/core/src/main/java/hudson/model/Queue.java
+++ b/core/src/main/java/hudson/model/Queue.java
@@ -646,7 +646,7 @@ public class Queue extends ResourceController implements Saveable {
public synchronized boolean cancel(Item item) {
LOGGER.log(Level.FINE, "Cancelling {0} item#{1}", new Object[] {item.task, item.id});
- boolean r = item.leave(this);
+ boolean r = item.cancel(this);
LeftItem li = new LeftItem(item);
li.enter(this);
diff --git a/test/src/test/java/hudson/model/QueueTest.java b/test/src/test/java/hudson/model/QueueTest.java
index c5c354d571..93bcb5ba05 100644
--- a/test/src/test/java/hudson/model/QueueTest.java
+++ b/test/src/test/java/hudson/model/QueueTest.java
@@ -59,6 +59,7 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
+import java.util.concurrent.CancellationException;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
@@ -548,4 +549,34 @@ public class QueueTest extends HudsonTestCase {
assertFalse("Project " + project2.getDisplayName() + " stuck in pendings",item.task.getName().equals(project2.getName()));
}
}
+
+ public void testCancelInQueue() throws Exception
+ {
+ // parepare an offline slave.
+ DumbSlave slave = createOnlineSlave();
+ assertFalse(slave.toComputer().isOffline());
+ slave.toComputer().disconnect(null).get();
+ assertTrue(slave.toComputer().isOffline());
+
+ FreeStyleProject p = createFreeStyleProject();
+ p.setAssignedNode(slave);
+
+ QueueTaskFuture f = p.scheduleBuild2(0);
+ try {
+ f.get(3, TimeUnit.SECONDS);
+ fail("Should time out (as the slave is offline).");
+ } catch (TimeoutException e) {
+ }
+
+ Queue.Item item = Queue.getInstance().getItem(p);
+ assertNotNull(item);
+ Queue.getInstance().doCancelItem(item.id);
+ assertNull(Queue.getInstance().getItem(p));
+
+ try {
+ f.get(10, TimeUnit.SECONDS);
+ fail("Should not get (as it is cancelled).");
+ } catch (CancellationException e) {
+ }
+ }
}