From 388ee68cc75ba04b10ce19c702af3f7e1dce768c Mon Sep 17 00:00:00 2001 From: Allen Wild Date: Thu, 1 Mar 2018 09:32:20 -0500 Subject: [PATCH] [JENKINS-49813] RunningJobs: Remove extra shouldCancelPatchsetNumber check An extra check for !shouldCancelPatchsetNumber after the check for (!abortBecauseOfTopic && !shouldCancelpatchsetNumber) breaks the "Abort patch sets with same topic" feature. It appears that these lines were added inadvertently during merge conflict resolution in 7455d86c5d0eaf72743094d64e5faa23b1a5bf82. Removing this extra if block allows for cancelling running jobs when a new patchset arrives on the same topic. Signed-off-by: Allen Wild --- .../plugins/gerrit/trigger/hudsontrigger/GerritTrigger.java | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/main/java/com/sonyericsson/hudson/plugins/gerrit/trigger/hudsontrigger/GerritTrigger.java b/src/main/java/com/sonyericsson/hudson/plugins/gerrit/trigger/hudsontrigger/GerritTrigger.java index f3c875cf2..d87bf3d24 100644 --- a/src/main/java/com/sonyericsson/hudson/plugins/gerrit/trigger/hudsontrigger/GerritTrigger.java +++ b/src/main/java/com/sonyericsson/hudson/plugins/gerrit/trigger/hudsontrigger/GerritTrigger.java @@ -2277,11 +2277,6 @@ public void scheduled(ChangeBasedEvent event) { continue; } - - if (!shouldCancelPatchsetNumber) { - continue; - } - outdatedEvents.add(runningChangeBasedEvent); it.remove(); }