From f1c455507816298b20a8cd739555c9779cde598a Mon Sep 17 00:00:00 2001 From: ItalyPaleAle <43508+ItalyPaleAle@users.noreply.github.com> Date: Tue, 11 Oct 2022 23:33:54 +0000 Subject: [PATCH] Fixed merge conflict Signed-off-by: ItalyPaleAle <43508+ItalyPaleAle@users.noreply.github.com> --- internal/component/azure/servicebus/subscription.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/component/azure/servicebus/subscription.go b/internal/component/azure/servicebus/subscription.go index 3b892a8e1..ff5cd9338 100644 --- a/internal/component/azure/servicebus/subscription.go +++ b/internal/component/azure/servicebus/subscription.go @@ -197,7 +197,7 @@ func (s *Subscription) ReceiveAndBlock(handler HandlerFunc, lockRenewalInSec int // Receiver loop for { select { - case s.activeMessagesChan <- struct{}{}: + case s.activeOperationsChan <- struct{}{}: // No-op // This blocks if there are too many active operations already // This is released by the handler, but if the loop ends before it reaches the handler, make sure to release it with `<-s.activeOperationsChan`