root
/
jenkins
mirror of https://github.com/jenkinsci/jenkins.git
1
0
Fork 0
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Removed dead code from `Queue.ItemList` (#10674)
Changelog Drafter / update_draft_release (push) Waiting to run Details
Changelog Drafter / jenkins_io_draft (push) Waiting to run Details
Label conflicting PRs / main (push) Waiting to run Details

This commit is contained in:
Jesse Glick 2025-05-23 06:10:29 -04:00 committed by GitHub
parent 06600a11fa
commit fdb1dc9e74
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 2 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
core/src/main/java/hudson/model/Queue.java
View File

@ -93,7 +93,6 @@ import java.util.Collections;
import java.util.GregorianCalendar;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
@ -1541,7 +1540,7 @@ public class Queue extends ResourceController implements Saveable {
{ // blocked -> buildable
// copy as we'll mutate the list and we want to process in a potentially different order
List<BlockedItem> blockedItems = new ArrayList<>(blockedProjects.values());
List<BlockedItem> blockedItems = new ArrayList<>((blockedProjects));
// if facing a cycle of blocked tasks, ensure we process in the desired sort order
if (s != null) {
s.sortBlockedItems(blockedItems);
@ -2954,29 +2953,8 @@ public class Queue extends ResourceController implements Saveable {
return get(task) != null;
}
public T remove(Task task) {
Iterator<T> it = iterator();
while (it.hasNext()) {
T t = it.next();
if (t.task.equals(task)) {
it.remove();
return t;
}
}
return null;
}
public void put(Task task, T item) {
assert item.task.equals(task);
add(item);
}
public ItemList<T> values() {
return this;
}
/**
* Works like {@link #remove(Task)} but also marks the {@link Item} as cancelled.
* Removes a task and marks the {@link Item} as cancelled.
*/
public T cancel(Task p) {
T x = get(p);