Skip to content

Commit

Permalink
Merge branch 'camelpunch-more_unused_vars'
Browse files Browse the repository at this point in the history
  • Loading branch information
michaelklishin committed Mar 1, 2016
2 parents f8a77de + e316ac2 commit e429256
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 4 deletions.
1 change: 0 additions & 1 deletion lib/bunny/channel.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion lib/bunny/get_response.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions lib/bunny/queue.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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
Expand Down

0 comments on commit e429256

Please sign in to comment.