stomper 2.0.4 → 2.0.5

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changes
 
+## 2.0.5 - 2011-03-08
+
+* fixed issue with reusing connections after heartbeating extensions were
+  included
+
+* three releases in one day... pretty awesome.
+
 ## 2.0.4 - 2011-03-08
 
 * minor issue where extraneous on\_connection\_died events were triggered.

data/lib/stomper/connection.rb

@@ -429,6 +429,7 @@ class Stomper::Connection
       end
     else
       trigger_event(:on_connection_died, self)
+      nil
     end
   end
   

data/lib/stomper/extensions/heartbeat.rb

@@ -77,7 +77,7 @@ module Stomper::Extensions::Heartbeat
     def client_alive?
       # Consider some benchmarking to determine if this is faster than
       # re-writing the method after its first invocation.
-      heartbeat_client_limit == 0 ||
+      @connecting || heartbeat_client_limit == 0 ||
         duration_since_transmitted <= heartbeat_client_limit
     end
     
@@ -88,7 +88,7 @@ module Stomper::Extensions::Heartbeat
     # @see #heartbeat_broker_limit
     # @see #client_alive?
     def broker_alive?
-      heartbeat_broker_limit == 0 ||
+      @connecting || heartbeat_broker_limit == 0 ||
         duration_since_received <= heartbeat_broker_limit
     end
   end

data/lib/stomper/version.rb

@@ -3,5 +3,5 @@
 # Primary namespace of the stomper gem.
 module Stomper
   # The current version of the stomper gem.
-  VERSION = '2.0.4'
+  VERSION = '2.0.5'
 end

metadata

@@ -2,7 +2,7 @@
 name: stomper
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 2.0.4
+  version: 2.0.5
 platform: ruby
 authors: 
 - Ian D. Eccles