Skip to content

Commit c3bf2de

Browse files
Kaspar TintKaspar Tint
authored andcommitted
Fix race condition in JenkinsTriggerHelper
1 parent 330dcb6 commit c3bf2de

File tree

1 file changed

+4
-7
lines changed

1 file changed

+4
-7
lines changed

jenkins-client/src/main/java/com/offbytwo/jenkins/JenkinsTriggerHelper.java

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -135,16 +135,13 @@ private BuildWithDetails triggerJobAndWaitUntilFinished(String jobName, QueueRef
135135
return result;
136136
}
137137

138-
job = this.server.getJob(jobName);
139-
Build lastBuild = job.getLastBuild();
140-
141-
boolean isBuilding = lastBuild.details().isBuilding();
138+
Build build = server.getBuild(queueItem);
139+
boolean isBuilding = build.details().isBuilding();
142140
while (isBuilding) {
143-
// TODO: May be we should make this configurable?
144141
Thread.sleep(200);
145-
isBuilding = lastBuild.details().isBuilding();
142+
isBuilding = build.details().isBuilding();
146143
}
147144

148-
return lastBuild.details();
145+
return build.details();
149146
}
150147
}

0 commit comments

Comments
 (0)