ione 1.1.4 → 1.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 166255b7792cfb6e2692c28ecd819874eecec4b5
-  data.tar.gz: c12c7574df507268a02c86b87924a9d7bea0c405
+  metadata.gz: db1f327275f2a707826e35fe337e9244e24579d3
+  data.tar.gz: 49634515f2915a2d148fc9bd7261d3995a9c9624
 SHA512:
-  metadata.gz: 3a6252fe2dcd04eda59a758bcf3959068bc466cab12d8794f04f95a91db2a8c6f76bbf8f38003459082be7a36ed708283a20281974c6a439b21f51dac08c22ec
-  data.tar.gz: 1ed5e64c259493d2321aebd7298da66a5b02952740942c9aa5b5edfe65596def5777443700d5ce2e0c4142cb8bd42007afff280f84a5673f5c7f9a283f9ee57f
+  metadata.gz: 5573efe1dab6a07649012f63b02dd160023033ba674cb582050d57aaeef4a98cbd00d43651d6d732c3e2d98e32b2cdf838a678836904b9066cf4bb9fda22d806
+  data.tar.gz: 8a0b37f8dde7c69f1f05a4bed764c2c3cb5acdd2460fed882d71dd4bc0c1155983e07a2cf2c2ee76510eff1afd8b4f8496a310b308c7838bf411df4a99b0d4ac

data/lib/ione/io/io_reactor.rb

@@ -293,13 +293,21 @@ module Ione
       end
 
       def cancel_timer(timer_future)
+        timer = nil
         @lock.lock
-        timer_pair = @timers.find { |pair| (p = pair[1]) && p.future == timer_future }
-        @timers = @timers.reject { |pair| pair[1].nil? || pair == timer_pair }
-        timer_pair && timer_pair[1].fail(CancelledError.new)
+        begin
+          if (timer_pair = @timers.find { |pair| (p = pair[1]) && p.future == timer_future })
+            @timers = @timers.reject { |pair| pair[1].nil? || pair == timer_pair }
+            timer = timer_pair[1]
+            timer_pair[1] = nil
+          end
+        ensure
+          @lock.unlock
+        end
+        if timer
+          timer.fail(CancelledError.new)
+        end
         nil
-      ensure
-        @lock.unlock
       end
 
       def close_sockets
@@ -348,11 +356,18 @@ module Ione
       end
 
       def check_timers!
-        timers = @timers
-        timers.each do |pair|
-          if pair[1] && pair[0] <= @clock.now
-            pair[1].fulfill
-            pair[1] = nil
+        now = @clock.now
+        @timers.each do |pair|
+          if pair[1] && pair[0] <= now
+            timer = nil
+            @lock.lock
+            begin
+              timer = pair[1]
+              pair[1] = nil
+            ensure
+              @lock.unlock
+            end
+            timer.fulfill
           end
         end
       end

data/lib/ione/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module Ione
-  VERSION = '1.1.4'.freeze
+  VERSION = '1.1.5'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ione
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.1.5
 platform: ruby
 authors:
 - Theo Hultberg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-15 00:00:00.000000000 Z
+date: 2014-10-26 00:00:00.000000000 Z
 dependencies: []
 description: Reactive programming framework for Ruby, painless evented IO, futures
   and an efficient byte buffer