Merge pull request #220 from mediaslave24/1.5.x-stable

Ensure that frameset will be cleared
ruby-amqp · Oct 17, 2015 · dd0b2de · dd0b2de
2 parents 900c02c + 5ee13d6
commit dd0b2de
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/lib/amqp/session.rb b/lib/amqp/session.rb
@@ -930,9 +930,12 @@ def receive_frame(frame)
       @frames[frame.channel] << frame
 
       if frameset_complete?(@frames[frame.channel])
-        receive_frameset(@frames[frame.channel])
-        # for channel.close, frame.channel will be nil. MK.
-        clear_frames_on(frame.channel) if @frames[frame.channel]
+        begin
+          receive_frameset(@frames[frame.channel])
+        ensure # Ensure that frames always will be cleared
+          # for channel.close, frame.channel will be nil. MK.
+          clear_frames_on(frame.channel) if @frames[frame.channel]
+        end
       end
     end