From f71c79918a76d89542d41f2d5cbfc250aa4f88fd Mon Sep 17 00:00:00 2001 From: mindless Date: Wed, 18 Nov 2009 06:37:09 +0000 Subject: [PATCH] [FIXED HUDSON-4878] r22948 introduced a little bug in that a label with no nodes generates an exception when trying to get the cause of blockage (calls next() on empty iterator) git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@23811 71c3de6d-444a-0410-be80-ed276b4c234a --- core/src/main/java/hudson/model/Queue.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/main/java/hudson/model/Queue.java b/core/src/main/java/hudson/model/Queue.java index 243e1ba39e..4585a0284d 100644 --- a/core/src/main/java/hudson/model/Queue.java +++ b/core/src/main/java/hudson/model/Queue.java @@ -1375,7 +1375,7 @@ public class Queue extends ResourceController implements Saveable { if (label != null) { if (label.isOffline()) { Set nodes = label.getNodes(); - if (nodes.size() > 1) return new BecauseLabelIsOffline(label); + if (nodes.size() != 1) return new BecauseLabelIsOffline(label); else return new BecauseNodeIsOffline(nodes.iterator().next()); } } @@ -1384,7 +1384,7 @@ public class Queue extends ResourceController implements Saveable { return CauseOfBlockage.fromMessage(Messages._Queue_WaitingForNextAvailableExecutor()); Set nodes = label.getNodes(); - if (nodes.size() > 1) return new BecauseLabelIsBusy(label); + if (nodes.size() != 1) return new BecauseLabelIsBusy(label); else return new BecauseNodeIsBusy(nodes.iterator().next()); }