diff --git a/pom.xml b/pom.xml
index 39694a4..a67e90b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
4.0.0
com.trimble.tekla
TeamCityTriggerHook
- 5.0.0
+ 5.0.1
Tekla
diff --git a/src/main/java/com/trimble/tekla/TeamcityPullrequestEventListener.java b/src/main/java/com/trimble/tekla/TeamcityPullrequestEventListener.java
index f600d9a..ba497a2 100644
--- a/src/main/java/com/trimble/tekla/TeamcityPullrequestEventListener.java
+++ b/src/main/java/com/trimble/tekla/TeamcityPullrequestEventListener.java
@@ -24,7 +24,6 @@
import com.atlassian.bitbucket.pull.PullRequestService;
import com.atlassian.bitbucket.repository.Repository;
import com.atlassian.bitbucket.setting.Settings;
-import com.atlassian.bitbucket.user.ApplicationUser;
import com.atlassian.event.api.EventListener;
import com.trimble.tekla.helpers.ChangesetService;
import com.trimble.tekla.pojo.Trigger;
@@ -188,9 +187,9 @@ private void TriggerBuildFromPullRequest(final PullRequest pr, Boolean UpdatedRe
true);
final JSONObject obj = new JSONObject(buildData);
- final String count = obj.getString("count");
+ final Integer count = obj.getInt("count");
- if (count.equals("0") || !buildConfig.isCancelRunningBuilds()) {
+ if (count == 0 || !buildConfig.isCancelRunningBuilds()) {
this.connector.QueueBuild(
conf,
buildConfig.getBranchConfig(),
@@ -205,7 +204,7 @@ private void TriggerBuildFromPullRequest(final PullRequest pr, Boolean UpdatedRe
final JSONArray builds = obj.getJSONArray("build");
for (int i = 0; i < builds.length(); i++) {
final String buildState = builds.getJSONObject(i).getString("state");
- final String id = builds.getJSONObject(i).getString("id");
+ final String id = Integer.toString(builds.getJSONObject(i).getInt("id"));
if (buildState.equals("running")) {
this.connector.ReQueueBuild(conf, id, settings.get(), false, repo.getName());
} else if (buildState.equals("queued")) {
diff --git a/src/main/java/com/trimble/tekla/TeamcityTriggerHook.java b/src/main/java/com/trimble/tekla/TeamcityTriggerHook.java
index e3509a3..41227ca 100644
--- a/src/main/java/com/trimble/tekla/TeamcityTriggerHook.java
+++ b/src/main/java/com/trimble/tekla/TeamcityTriggerHook.java
@@ -243,17 +243,18 @@ private void QueueBuild(
// check if build is running
final String buildData = this.connector.GetBuildsForBranch(conf, branch, buildIdIn, settings, repoName, true);
+ TeamcityLogger.logMessage(context, repoName, "Build Data Retrieved: " + buildData);
try {
final JSONObject obj = new JSONObject(buildData);
- final String count = obj.getString("count");
+ final Integer count = obj.getInt("count");
- if (count.equals("0") || !cancelRunningBuilds) {
+ if (count == 0 || !cancelRunningBuilds) {
this.connector.QueueBuild(conf, branch, buildIdIn, comment, isDefault, settings, repoName, null);
} else {
final JSONArray builds = obj.getJSONArray("build");
for (int i = 0; i < builds.length(); i++) {
final String buildState = builds.getJSONObject(i).getString("state");
- final String id = builds.getJSONObject(i).getString("id");
+ final String id = Integer.toString(builds.getJSONObject(i).getInt("id"));
if (buildState.equals("running")) {
this.connector.ReQueueBuild(conf, id, settings, false, repoName);
} else if (buildState.equals("queued")) {
diff --git a/src/main/java/com/trimble/tekla/teamcity/TeamcityConnector.java b/src/main/java/com/trimble/tekla/teamcity/TeamcityConnector.java
index 5bdaa14..eb2533c 100644
--- a/src/main/java/com/trimble/tekla/teamcity/TeamcityConnector.java
+++ b/src/main/java/com/trimble/tekla/teamcity/TeamcityConnector.java
@@ -100,7 +100,7 @@ public List GetQueuedAndRunningBuilds(TeamcityConfigurati
}
String buildType = queued.getString("buildTypeId");
- String id = queued.getString("id");
+ final String id = Integer.toString(queued.getInt("id"));
String webUrl = queued.getString("webUrl");
TeamcityQueuedElement queuedElement = new TeamcityQueuedElement();
queuedElement.setBranch(branchName);