From e731c76c25761dd5d4c2282ef267a68519f66862 Mon Sep 17 00:00:00 2001 From: Andrew Bruce Date: Tue, 1 Mar 2016 21:56:44 +0000 Subject: [PATCH 1/2] Remove unused ivar in Channel --- lib/bunny/channel.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/bunny/channel.rb b/lib/bunny/channel.rb index d1199d0b2..07054a205 100644 --- a/lib/bunny/channel.rb +++ b/lib/bunny/channel.rb @@ -1415,7 +1415,6 @@ def confirm_select(callback=nil) Bunny::Timeout.timeout(wait_on_continuations_timeout, ClientTimeout) do @last_confirm_select_ok = wait_on_continuations end - @confirm_mode = true raise_if_continuation_resulted_in_a_channel_error! @last_confirm_select_ok end From e316ac23ec77118311b045df8b846ac0e247232e Mon Sep 17 00:00:00 2001 From: Andrew Bruce Date: Tue, 1 Mar 2016 22:02:52 +0000 Subject: [PATCH 2/2] Remove unused arg from GetResponse --- lib/bunny/get_response.rb | 2 +- lib/bunny/queue.rb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/bunny/get_response.rb b/lib/bunny/get_response.rb index 20a97af8f..269e78366 100644 --- a/lib/bunny/get_response.rb +++ b/lib/bunny/get_response.rb @@ -20,7 +20,7 @@ class GetResponse attr_reader :channel # @private - def initialize(get_ok, consumer, channel) + def initialize(get_ok, channel) @get_ok = get_ok @hash = { :delivery_tag => @get_ok.delivery_tag, diff --git a/lib/bunny/queue.rb b/lib/bunny/queue.rb index 2b8c006a2..8e70ec28f 100644 --- a/lib/bunny/queue.rb +++ b/lib/bunny/queue.rb @@ -249,7 +249,7 @@ def pop(opts = {:manual_ack => false}, &block) if block if properties - di = GetResponse.new(get_response, properties, @channel) + di = GetResponse.new(get_response, @channel) mp = MessageProperties.new(properties) block.call(di, mp, content) @@ -258,7 +258,7 @@ def pop(opts = {:manual_ack => false}, &block) end else if properties - di = GetResponse.new(get_response, properties, @channel) + di = GetResponse.new(get_response, @channel) mp = MessageProperties.new(properties) [di, mp, content] else