mirror of
https://github.com/jenkinsci/jenkins.git
synced 2026-11-21 15:55:40 +00:00
[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
This commit is contained in:
1 parent
996ddf1267
commit
f71c79918a
1 file changed
+2
-2
@@ -1375,7 +1375,7 @@ public class Queue extends ResourceController implements Saveable {
|
||||
if (label != null) {
|
||||
if (label.isOffline()) {
|
||||
Set<Node> 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<Node> 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());
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user