Merge branch 're-gmbh-main'

ruby-amqp · Dec 19, 2022 · e59ad79 · e59ad79
2 parents a2f3e10 + 108383a
commit e59ad79
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/lib/bunny/session.rb b/lib/bunny/session.rb
@@ -671,8 +671,12 @@ def handle_frame(ch_number, method)
           # avoid doing that while holding a mutex lock. MK.
           ch.handle_method(method)
         ensure
-          # synchronises on @channel_mutex under the hood
-          self.unregister_channel(ch)
+          if ch.nil?
+            @logger.warn "Received a server-sent channel.close but the channel was not found locally. Ignoring the frame."
+          else
+            # synchronises on @channel_mutex under the hood
+            self.unregister_channel(ch)
+          end
         end
       when AMQ::Protocol::Basic::GetEmpty then
         ch = find_channel(ch_number)