zk 0.8.3 → 0.8.4

data/lib/z_k/pool.rb

@@ -59,8 +59,10 @@ module ZK
 
           @pool.clear
 
-          while cnx = @connections.shift
-            cnx.close!
+          until @connections.empty?
+            if cnx = @connections.shift
+              cnx.close!
+            end
           end
 
           @state = :closed
@@ -105,7 +107,7 @@ module ZK
       end
 
       def size #:nodoc:
-        @connection.synchronize { @pool.size }
+        @mutex.synchronize { @pool.size }
       end
 
       def pool_state #:nodoc:
@@ -191,6 +193,10 @@ module ZK
 
             if @pool.length > 0
               cnx = @pool.shift
+
+              # XXX(slyphon): not really sure how this case happens, but protect against it as we're
+              # seeing an issue in production
+              next if cnx.nil?
               
               # if the connection isn't connected, then set up an on_connection
               # handler and try the next one in the pool

data/lib/z_k/version.rb

@@ -1,3 +1,3 @@
 module ZK
-  VERSION = "0.8.3"
+  VERSION = "0.8.4"
 end

data/spec/z_k/election_spec.rb

@@ -44,7 +44,7 @@ describe ZK::Election do
             # wait for us to signal
             queue.pop
 
-            $stderr.puts "obama on_winning_election entered"
+#             $stderr.puts "obama on_winning_election entered"
             @obama_won = true
           end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: zk
 version: !ruby/object:Gem::Version 
-  hash: 57
+  hash: 55
   prerelease: 
   segments: 
   - 0
   - 8
-  - 3
-  version: 0.8.3
+  - 4
+  version: 0.8.4
 platform: ruby
 authors: 
 - Jonathan D. Simms
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-27 00:00:00 +00:00
+date: 2011-07-08 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency