From 8d434f6a6f18c5172db9a8216d61cd50b746c964 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felf=C3=B6ldi=20Zsolt?= <zsfelfoldi@gmail.com>
Date: Fri, 27 Oct 2017 16:18:53 +0200
Subject: les, core/bloombits: post-LES/2 fixes (#15391)

* les: fix topic ID

* core/bloombits: fix interface conversion
---
 core/bloombits/matcher.go | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'core/bloombits')

diff --git a/core/bloombits/matcher.go b/core/bloombits/matcher.go
index a75f8c085..d38d4ba83 100644
--- a/core/bloombits/matcher.go
+++ b/core/bloombits/matcher.go
@@ -534,7 +534,10 @@ func (s *MatcherSession) Close() {
 
 // Error returns any failure encountered during the matching session.
 func (s *MatcherSession) Error() error {
-	return s.err.Load().(error)
+	if err := s.err.Load(); err != nil {
+		return err.(error)
+	}
+	return nil
 }
 
 // AllocateRetrieval assigns a bloom bit index to a client process that can either
-- 
cgit v1.2.3