From 73870ec346cf11521edc6db2b7bc150808c29161 Mon Sep 17 00:00:00 2001
From: Christian Dupuis <cd@atomist.com>
Date: Fri, 14 Dec 2018 14:50:16 +0100
Subject: [PATCH] Register when sdm instance is already available

---
 lib/api/goal/GoalWithFulfillment.ts | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/lib/api/goal/GoalWithFulfillment.ts b/lib/api/goal/GoalWithFulfillment.ts
index e13f43356..d2367650a 100644
--- a/lib/api/goal/GoalWithFulfillment.ts
+++ b/lib/api/goal/GoalWithFulfillment.ts
@@ -166,11 +166,15 @@ export abstract class FulfillableGoal extends GoalWithPrecondition implements Re
     }
 
     public withExecutionListener(listener: GoalExecutionListener): this {
-        this.goalListeners.push(async gi => {
-            if (gi.goalEvent.uniqueName === this.uniqueName) {
-                return listener(gi);
-            }
-        });
+        const wrappedListener = async gi => {
+                if (gi.goalEvent.uniqueName === this.uniqueName) {
+                    return listener(gi);
+                }
+            };
+        if (this.sdm) {
+            this.sdm.addGoalExecutionListener(wrappedListener);
+        }
+        this.goalListeners.push(wrappedListener);
         return this;
     }