[ruby-cvs:51986] naruse:r44841 (ruby_2_1): merge revision(s) 44517, 44518, 44519, 44523: [Backport #9354]

naruse at ruby-lang.org naruse at ruby-lang.org
Wed Feb 5 21:43:21 JST 2014


naruse	2014-02-05 21:43:19 +0900 (Wed, 05 Feb 2014)

  New Revision: 44841

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=44841

  Log:
    merge revision(s) 44517,44518,44519,44523: [Backport #9354]
    
    * lib/timeout.rb (Timeout#timeout): when a custom exception is given,
      no instance is needed to be caught, so defer creating new instance
      until it is raised.  [ruby-core:59511] [Bug #9354]
    
    * 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::ExitException.catch): pass arguments
      for new instance.
    
    * lib/timeout.rb (Timeout::ExitException#exception): fallback to
      Timeout::Error if couldn't throw.  [ruby-dev:47872] [Bug #9380]
    
    * lib/timeout.rb (Timeout#timeout): initialize ExitException with
      message for the fallback case.

  Modified directories:
    branches/ruby_2_1/
  Modified files:
    branches/ruby_2_1/ChangeLog
    branches/ruby_2_1/lib/timeout.rb
    branches/ruby_2_1/test/test_timeout.rb
    branches/ruby_2_1/version.h


More information about the ruby-cvs mailing list