From b42d423cef81208e387cfc318103157a01748d96 Mon Sep 17 00:00:00 2001
From: Staffan Larsen <sla@spotify.com>
Date: Tue, 4 Jul 2017 08:43:49 +0200
Subject: [PATCH 1/2] Fixed #45284  o JenkinsTriggerHelper can wait for too
 long if job allows    concurrent builds.

---
 .../com/offbytwo/jenkins/JenkinsTriggerHelper.java   | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/jenkins-client/src/main/java/com/offbytwo/jenkins/JenkinsTriggerHelper.java b/jenkins-client/src/main/java/com/offbytwo/jenkins/JenkinsTriggerHelper.java
index 3f1ed2b8..cf1f0cdc 100644
--- a/jenkins-client/src/main/java/com/offbytwo/jenkins/JenkinsTriggerHelper.java
+++ b/jenkins-client/src/main/java/com/offbytwo/jenkins/JenkinsTriggerHelper.java
@@ -86,7 +86,7 @@ public BuildWithDetails triggerJobAndWaitUntilFinished(String jobName, Map<Strin
         JobWithDetails job = this.server.getJob(jobName);
         QueueReference queueRef = job.build(params, crumbFlag);
 
-        return triggerJobAndWaitUntilFinished(jobName, queueRef);
+        return triggerJobAndWaitUntilFinished(queueRef);
     }
 
     /**
@@ -107,11 +107,10 @@ public BuildWithDetails triggerJobAndWaitUntilFinished(String jobName, boolean c
         JobWithDetails job = this.server.getJob(jobName);
         QueueReference queueRef = job.build(crumbFlag);
 
-        return triggerJobAndWaitUntilFinished(jobName, queueRef);
+        return triggerJobAndWaitUntilFinished(queueRef);
     }
 
     /**
-     * @param jobName The name of the job.
      * @param queueRef {@link QueueReference}
      * @return In case of an cancelled job you will get
      *         {@link BuildWithDetails#getResult()}
@@ -120,14 +119,13 @@ public BuildWithDetails triggerJobAndWaitUntilFinished(String jobName, boolean c
      * @throws IOException in case of errors.
      * @throws InterruptedException In case of interrupts.
      */
-    private BuildWithDetails triggerJobAndWaitUntilFinished(String jobName, QueueReference queueRef)
+    private BuildWithDetails triggerJobAndWaitUntilFinished(QueueReference queueRef)
             throws IOException, InterruptedException {
-        JobWithDetails job = this.server.getJob(jobName);
         QueueItem queueItem = this.server.getQueueItem(queueRef);
 
-        while (!queueItem.isCancelled() && job.isInQueue()) {
+        while (!queueItem.isCancelled()
+               && (queueItem.getExecutable() == null || queueItem.getExecutable().getNumber() == null)) {
             Thread.sleep(retryInterval);
-            job = this.server.getJob(jobName);
             queueItem = this.server.getQueueItem(queueRef);
         }
 

From 4dbd5a2f4d2df6e7dd6351b4b5487c26c2ce0e43 Mon Sep 17 00:00:00 2001
From: Staffan Larsen <sla@spotify.com>
Date: Fri, 1 Sep 2017 08:48:06 +0200
Subject: [PATCH 2/2] Updated information in release notes

---
 ReleaseNotes.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ReleaseNotes.md b/ReleaseNotes.md
index 8c70690e..ef16385e 100644
--- a/ReleaseNotes.md
+++ b/ReleaseNotes.md
@@ -2,6 +2,10 @@
 
 ## Release 0.3.8 (NOT RELEASED YET)
 
+* [Fixed Issue 45284][jissue-45284]
+
+   JenkinsTriggerHelper can wait for too long if job allows concurrent builds.
+
 * [Fixed Issue 98][issue-98]
    
    Splitting fix made for jacoco reports from Jenkins #98.