From 4cebabb633d80c5a875fbc19382f88e8eb1ffbb9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B8rgen=20Jervidalo?= <jorgen.jervidalo@schibsted.com>
Date: Sat, 15 Jun 2019 00:32:57 +0200
Subject: [PATCH] fix(gitlab): Don't send events to echo if not enabled (#462)

---
 .../spinnaker/igor/gitlabci/GitlabCiBuildMonitor.java     | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/igor-web/src/main/groovy/com/netflix/spinnaker/igor/gitlabci/GitlabCiBuildMonitor.java b/igor-web/src/main/groovy/com/netflix/spinnaker/igor/gitlabci/GitlabCiBuildMonitor.java
index 39ed85c20..d2ebc9ab1 100644
--- a/igor-web/src/main/groovy/com/netflix/spinnaker/igor/gitlabci/GitlabCiBuildMonitor.java
+++ b/igor-web/src/main/groovy/com/netflix/spinnaker/igor/gitlabci/GitlabCiBuildMonitor.java
@@ -32,7 +32,11 @@
 import com.netflix.spinnaker.igor.history.model.GenericBuildContent;
 import com.netflix.spinnaker.igor.history.model.GenericBuildEvent;
 import com.netflix.spinnaker.igor.model.BuildServiceProvider;
-import com.netflix.spinnaker.igor.polling.*;
+import com.netflix.spinnaker.igor.polling.CommonPollingMonitor;
+import com.netflix.spinnaker.igor.polling.DeltaItem;
+import com.netflix.spinnaker.igor.polling.LockService;
+import com.netflix.spinnaker.igor.polling.PollContext;
+import com.netflix.spinnaker.igor.polling.PollingDelta;
 import com.netflix.spinnaker.igor.service.BuildServices;
 import com.netflix.spinnaker.security.AuthenticatedRequest;
 import java.util.ArrayList;
@@ -204,7 +208,7 @@ private void sendEventForPipeline(
       String address,
       final String branchedSlug,
       String master) {
-    if (echoService != null) {
+    if (echoService.isPresent()) {
       sendEvent(pipeline.getRef(), project, pipeline, address, master);
       sendEvent(branchedSlug, project, pipeline, address, master);
     }