Merge pull request #981 from kaleido-io/nil-aggregator

add nil check for aggregator during WaitStop
hyperledger · Aug 18, 2022 · 71498e9 · 71498e9
2 parents d4f5c87 + 409594e
commit 71498e9
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/internal/events/event_manager.go b/internal/events/event_manager.go
@@ -202,7 +202,9 @@ func (em *eventManager) WaitStop() {
 		em.blobReceiver.stop()
 		em.blobReceiver = nil
 	}
-	<-em.aggregator.eventPoller.closed
+	if em.aggregator != nil {
+		<-em.aggregator.eventPoller.closed
+	}
 }
 
 func (em *eventManager) CreateUpdateDurableSubscription(ctx context.Context, subDef *core.Subscription, mustNew bool) (err error) {