amq-client 0.8.7.pre1 → 0.8.7

data/lib/amq/client/async/adapter.rb

@@ -211,7 +211,10 @@ module AMQ
         # @see  #close_connection
         def disconnect(reply_code = 200, reply_text = "Goodbye", class_id = 0, method_id = 0, &block)
           @intentionally_closing_connection = true
-          self.on_disconnection(&block)
+          self.on_disconnection do
+            @frames.clear
+            block.call if block
+          end
 
           # ruby-amqp/amqp#66, MK.
           if self.open?
@@ -515,7 +518,7 @@ module AMQ
           if frameset_complete?(@frames[frame.channel])
             receive_frameset(@frames[frame.channel])
             # for channel.close, frame.channel will be nil. MK.
-            @frames[frame.channel].clear if @frames[frame.channel]
+            clear_frames_on(frame.channel) if @frames[frame.channel]
           end
         end
 
@@ -540,6 +543,15 @@ module AMQ
           end
         end
 
+        # Clears frames that were received but not processed on given channel. Needs to be called
+        # when the channel is closed.
+        # @private
+        def clear_frames_on(channel_id)
+          raise ArgumentError, "channel id cannot be nil!" if channel_id.nil?
+
+          @frames[channel_id].clear
+        end
+
         # Sends a heartbeat frame if connection is open.
         # @api plugin
         def send_heartbeat
@@ -611,7 +623,6 @@ module AMQ
         # @see http://bit.ly/htCzCX AMQP 0.9.1 protocol documentation (Section 1.5.2.9)
         def handle_close(conn_close)
           closed!
-          # TODO: use proper exception class, provide protocol class (we know conn_close.class_id and conn_close.method_id) as well!
           self.exec_callback_yielding_self(:error, conn_close)
         end
 

data/lib/amq/client/async/channel.rb

@@ -404,6 +404,7 @@ module AMQ
         # @private
         def handle_close_ok(close_ok)
           self.status = :closed
+          self.connection.clear_frames_on(self.id)
           self.exec_callback_once_yielding_self(:close, close_ok)
         end
 
@@ -411,6 +412,7 @@ module AMQ
         # @private
         def handle_close(channel_close)
           self.status = :closed
+          self.connection.clear_frames_on(self.id)
           self.exec_callback_yielding_self(:error, channel_close)
 
           self.handle_connection_interruption(channel_close)

data/lib/amq/client/version.rb

@@ -2,6 +2,6 @@
 
 module AMQ
   module Client
-    VERSION = "0.8.7.pre1"
+    VERSION = "0.8.7"
   end
 end

metadata

@@ -1,15 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: amq-client
 version: !ruby/object:Gem::Version 
-  hash: 1923831827
-  prerelease: 6
+  hash: 49
+  prerelease: 
   segments: 
   - 0
   - 8
   - 7
-  - pre
-  - 1
-  version: 0.8.7.pre1
+  version: 0.8.7
 platform: ruby
 authors: 
 - Jakub Stastny
@@ -20,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-13 00:00:00 Z
+date: 2011-12-04 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: eventmachine
@@ -242,14 +240,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      hash: 25
+      hash: 3
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: amq-client