lib/amqp/channel.rb in amqp-1.5.3 vs lib/amqp/channel.rb in amqp-1.6.0

@@ -340,11 +340,11 @@
     # @api public
     def reuse
       old_id = @id
       # must release after we allocate a new id, otherwise we will end up
       # with the same value. MK.
-      @id    = self.class.next_channel_id
+      @id    = @connection.next_channel_id
       @connection.release_channel_id(old_id)
 
       @channel_is_open_deferrable.fail
       @channel_is_open_deferrable = AMQP::Deferrable.new
 
@@ -1182,18 +1182,14 @@
     # @return [Hash<String, Consumer>]
     def consumers
       @consumers
     end # consumers
 
-    # @return  [Array<Queue>]   Collection of queues that were declared on this channel.
-    def queues
-      @queues.values
-    end
 
-    # @return  [Array<Exchange>]  Collection of exchanges that were declared on this channel.
+    # @return  [Hash<Exchange>]  Collection of exchanges that were declared on this channel.
     def exchanges
-      @exchanges.values
+      @exchanges
     end
 
 
     # AMQP connection this channel belongs to.
     #
@@ -1412,10 +1408,10 @@
     def find_queue(name)
       @queues[name]
     end
 
 
-    RECOVERY_EVENTS = [:after_connection_interruption, :before_recovery, :after_recovery].freeze
+    RECOVERY_EVENTS = [:after_connection_interruption, :before_recovery, :after_recovery, :error].freeze
 
 
     # @api plugin
     # @private
     def reset_state!