diff --git a/bom/pom.xml b/bom/pom.xml index 541cc32a0c00..1d5fa04ce2ef 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -356,7 +356,7 @@ THE SOFTWARE. org.ow2.asm asm - 9.7 + 9.7.1 org.samba.jcifs diff --git a/core/src/main/java/jenkins/model/queue/ItemDeletion.java b/core/src/main/java/jenkins/model/queue/ItemDeletion.java index a2d954fbc459..b278f4d24c93 100644 --- a/core/src/main/java/jenkins/model/queue/ItemDeletion.java +++ b/core/src/main/java/jenkins/model/queue/ItemDeletion.java @@ -266,12 +266,10 @@ public static void cancelBuildsInProgress(@NonNull Item initiatingItem) throws F // comparison with executor.getCurrentExecutable() == executable currently should always be // true as we no longer recycle Executors, but safer to future-proof in case we ever // revisit recycling. - if (!entry.getKey().isAlive() + if (!entry.getKey().isActive() || entry.getValue() != entry.getKey().getCurrentExecutable()) { iterator.remove(); } - // I don't know why, but we have to keep interrupting - entry.getKey().interrupt(Result.ABORTED); } Thread.sleep(50L); } diff --git a/war/pom.xml b/war/pom.xml index f256a95017ca..d83ca1742a18 100644 --- a/war/pom.xml +++ b/war/pom.xml @@ -494,7 +494,7 @@ THE SOFTWARE. io.jenkins.plugins asm-api - 9.7-33.v4d23ef79fcc8 + 9.7.1-95.v9f552033802a_ hpi