diff --git a/ChangeLog b/ChangeLog index dc2a45f2d7..9c99edb75e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Wed Jan 28 21:32:24 2015 SHIBATA Hiroshi + + * thread.c: Improve documentation for Thread#value + [Bug #10694][ruby-core:67324][ci skip] + Tue Jan 27 16:04:19 2015 NAKAMURA Usaku * tool/redmine-backporter.rb: added `!` command. diff --git a/thread.c b/thread.c index 37c7252620..b7056a764d 100644 --- a/thread.c +++ b/thread.c @@ -959,10 +959,14 @@ thread_join_m(int argc, VALUE *argv, VALUE self) * call-seq: * thr.value -> obj * - * Waits for +thr+ to complete, using #join, and returns its value. + * Waits for +thr+ to complete, using #join, and returns its value or raises + * the exception which terminated the thread. * * a = Thread.new { 2 + 2 } * a.value #=> 4 + * + * b = Thread.new { raise 'something went wrong' } + * b.value #=> RuntimeError: something went wrong */ static VALUE