提交 f71c7991 编写于 作者: M mindless

[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
上级 996ddf12
......@@ -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());
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册