diff options
Diffstat (limited to 'lib/monitor.rb')
-rw-r--r-- | lib/monitor.rb | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/lib/monitor.rb b/lib/monitor.rb index 288ed755ea..2a59fa7cc0 100644 --- a/lib/monitor.rb +++ b/lib/monitor.rb @@ -103,13 +103,17 @@ module MonitorMixin # even if no other thread doesn't signal. # def wait(timeout = nil) - @monitor.__send__(:mon_check_owner) - count = @monitor.__send__(:mon_exit_for_cond) - begin - @cond.wait(@monitor.instance_variable_get(:@mon_mutex), timeout) - return true - ensure - @monitor.__send__(:mon_enter_for_cond, count) + Thread.handle_interrupt(Exception => :never) do + @monitor.__send__(:mon_check_owner) + count = @monitor.__send__(:mon_exit_for_cond) + begin + Thread.handle_interrupt(Exception => :immediate) do + @cond.wait(@monitor.instance_variable_get(:@mon_mutex), timeout) + end + return true + ensure + @monitor.__send__(:mon_enter_for_cond, count) + end end end |