diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-01-07 03:43:08 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-01-07 03:43:08 +0000 |
commit | 97c0aaea71f9855403dcf14f505079822029d439 (patch) | |
tree | 7656d2b6a72e8e6963dbe465abd99e38b336690b /ChangeLog | |
parent | 9f5537c5b39b230360af793977d9ddb5b539f4de (diff) | |
download | ruby-97c0aaea71f9855403dcf14f505079822029d439.tar.gz |
timeout.rb: fix for ExitException
* lib/timeout.rb (Timeout#timeout): should not rescue ordinarily
raised ExitException, which should not be thrown.
* lib/timeout.rb (Timeout::ExitException.catch): set @thread only if
it ought to be caught.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44518 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
-rw-r--r-- | ChangeLog | 8 |
1 files changed, 7 insertions, 1 deletions
@@ -1,4 +1,10 @@ -Tue Jan 7 12:42:35 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> +Tue Jan 7 12:43:06 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * lib/timeout.rb (Timeout#timeout): should not rescue ordinarily + raised ExitException, which should not be thrown. + + * lib/timeout.rb (Timeout::ExitException.catch): set @thread only if + it ought to be caught. * lib/timeout.rb (Timeout#timeout): when a custom exception is given, no instance is needed to be caught, so defer creating new instance |