From de65527e850fdac9a28d38e89d726bdc1bd70f85 Mon Sep 17 00:00:00 2001
From: devopsbo3 <69951731+devopsbo3@users.noreply.github.com>
Date: Fri, 10 Nov 2023 12:27:53 -0600
Subject: [PATCH] Revert "core/bloombits: fix deadlock when matcher session
 hits an error (#28184)"

This reverts commit 0e3ba93dbad5b44b8e53f3c22f86b30ef9e4cd40.
---
 core/bloombits/matcher.go | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/core/bloombits/matcher.go b/core/bloombits/matcher.go
index cf799c8324..d8f932041b 100644
--- a/core/bloombits/matcher.go
+++ b/core/bloombits/matcher.go
@@ -630,16 +630,13 @@ func (s *MatcherSession) Multiplex(batch int, wait time.Duration, mux chan chan
 			request <- &Retrieval{Bit: bit, Sections: sections, Context: s.ctx}
 
 			result := <-request
-
-			// Deliver a result before s.Close() to avoid a deadlock
-			s.deliverSections(result.Bit, result.Sections, result.Bitsets)
-
 			if result.Error != nil {
 				s.errLock.Lock()
 				s.err = result.Error
 				s.errLock.Unlock()
 				s.Close()
 			}
+			s.deliverSections(result.Bit, result.Sections, result.Bitsets)
 		}
 	}
 }