From 35a2a1e07e6bfa076bf86180f63f7a2902083e23 Mon Sep 17 00:00:00 2001
From: Jordi Jansen <jordi.jansen@infosupport.com>
Date: Thu, 23 Mar 2017 09:31:24 +0100
Subject: [PATCH] cancelPreviousJobsInQueueThatMatch should only cancel items
 that are started from the same job

---
 .../stashpullrequestbuilder/StashBuildTrigger.java             | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/stashpullrequestbuilder/stashpullrequestbuilder/StashBuildTrigger.java b/src/main/java/stashpullrequestbuilder/stashpullrequestbuilder/StashBuildTrigger.java
index a91bf676..e3f05e46 100644
--- a/src/main/java/stashpullrequestbuilder/stashpullrequestbuilder/StashBuildTrigger.java
+++ b/src/main/java/stashpullrequestbuilder/stashpullrequestbuilder/StashBuildTrigger.java
@@ -261,7 +261,8 @@ private void cancelPreviousJobsInQueueThatMatch(@Nonnull StashCause stashCause)
         logger.fine("Looking for queued jobs that match PR ID: " + stashCause.getPullRequestId());
         Queue queue = Jenkins.getInstance().getQueue();
         for (Queue.Item item : queue.getItems()) {
-            if (hasCauseFromTheSamePullRequest(item.getCauses(), stashCause)) {
+            logger.fine("Task name: " + item.task.getDisplayName() + " - Job Name: " + job.getDisplayName());
+            if (job.getDisplayName().equals(item.task.getDisplayName()) && hasCauseFromTheSamePullRequest(item.getCauses(), stashCause)) {
                 logger.info("Canceling item in queue: " + item);
                 queue.cancel(item);
             }