diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-12-07 05:04:02 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-12-07 05:04:02 +0000 |
commit | 08f0db2c68a9e306f3a637e9d32d9e7b8b1f2e92 (patch) | |
tree | f62afb5ed192f0bd674762fb6063c4a224649b9f /ChangeLog | |
parent | 9dd64b6053685a4db7d4e60d16b0fc090384dae0 (diff) |
timeout.rb: replace deferred exception after async_interrupt_timing
* lib/timeout.rb (Timeout#timeout): since async_interrupt_timing
re-raises a deferred exception, replace the timeout exception with
Timeout::Error after it. [Bug #7503]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38255 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
-rw-r--r-- | ChangeLog | 6 |
1 files changed, 6 insertions, 0 deletions
@@ -1,3 +1,9 @@ +Fri Dec 7 14:03:59 2012 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * lib/timeout.rb (Timeout#timeout): since async_interrupt_timing + re-raises a deferred exception, replace the timeout exception with + Timeout::Error after it. [Bug #7503] + Fri Dec 7 13:07:00 2012 Zachary Scott <zachary@zacharyscott.net> * doc/forwardable.rd: Remove stale documentation file |