From 1319e94270c269c6e8d2d1db15f01a47d1c6a3c0 Mon Sep 17 00:00:00 2001 From: Esteban Garcia Date: Mon, 8 Jul 2019 15:01:38 +0100 Subject: [PATCH] fix(bitbucket): use equals for string comparison on event_type (#600) Signed-off-by: Esteban Garcia --- .../spinnaker/echo/scm/BitbucketWehbookEventHandler.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/echo-webhooks/src/main/groovy/com/netflix/spinnaker/echo/scm/BitbucketWehbookEventHandler.java b/echo-webhooks/src/main/groovy/com/netflix/spinnaker/echo/scm/BitbucketWehbookEventHandler.java index 6fe57eda7..36072419b 100644 --- a/echo-webhooks/src/main/groovy/com/netflix/spinnaker/echo/scm/BitbucketWehbookEventHandler.java +++ b/echo-webhooks/src/main/groovy/com/netflix/spinnaker/echo/scm/BitbucketWehbookEventHandler.java @@ -201,7 +201,7 @@ private void handleBitbucketServerEvent(Event event, Map postedEvent) { } String eventType = event.content.get("event_type").toString(); - if (eventType == "repo:refs_changed") { + if (eventType.equals("repo:refs_changed")) { BitbucketServerRefsChangedEvent refsChangedEvent = objectMapper.convertValue(event.content, BitbucketServerRefsChangedEvent.class); if (refsChangedEvent.repository != null) { @@ -215,7 +215,7 @@ private void handleBitbucketServerEvent(Event event, Map postedEvent) { branch = emptyOrDefault(change.ref.id, "").replace("refs/heads/", ""); } } - } else if (eventType == "pr:merged") { + } else if (eventType.equals("pr:merged")) { BitbucketServerPrMergedEvent prMergedEvent = objectMapper.convertValue(event.content, BitbucketServerPrMergedEvent.class); if (prMergedEvent.pullRequest != null && prMergedEvent.pullRequest.toRef != null) {