[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 7455d86. Removing this extra if block allows for cancelling running jobs when a new patchset arrives on the same topic. Signed-off-by: Allen Wild <allenwild93@gmail.com>
jenkinsci · Mar 1, 2018 · 388ee68 · 388ee68
1 parent 76f654c
commit 388ee68
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/...main/java/com/sonyericsson/hudson/plugins/gerrit/trigger/hudsontrigger/GerritTrigger.java b/...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();
                     }