From 9977ccdaa6998a2af7d914e4743081bab1e463eb Mon Sep 17 00:00:00 2001 From: mindless Date: Fri, 23 Jul 2010 19:01:57 +0000 Subject: [PATCH] [FIXED HUDSON-7054] use Node.canTake(Task) in Queue._getBuildableItems so that Mode.EXCLUSIVE ("only for tied jobs") setting is respected. git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@33185 71c3de6d-444a-0410-be80-ed276b4c234a --- core/src/main/java/hudson/model/Queue.java | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/core/src/main/java/hudson/model/Queue.java b/core/src/main/java/hudson/model/Queue.java index 5bfb2f3ca4..fc6e08d991 100644 --- a/core/src/main/java/hudson/model/Queue.java +++ b/core/src/main/java/hudson/model/Queue.java @@ -593,14 +593,10 @@ public class Queue extends ResourceController implements Saveable { } private void _getBuildableItems(Computer c, ItemList col, List result) { + Node node = c.getNode(); for (BuildableItem p : col.values()) { - Label l = p.task.getAssignedLabel(); - if (l != null) { - // if a project has assigned label, it can be only built on it - if (!l.contains(c.getNode())) - continue; - } - result.add(p); + if (node.canTake(p.task) == null) + result.add(p); } } -- GitLab