* thread.c (thread_join): A trap handler check was moved from

  thread_join_m because Thread#value should be raised an exception
  too.
* thread.c (thread_join_m): remove trap handler check.
* test/ruby/test_thread.rb (test_thread_join_in_trap): add test
  for thread#value.
* NEWS: documentation fix for the above.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37918 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 4 insertions, 6 deletions

diff --git a/thread.c b/thread.c
index a0a3472b26..473713f862 100644
--- a/thread.c
+++ b/thread.c
@@ -740,6 +740,10 @@ thread_join(rb_thread_t *target_th, double delay)
     if (GET_VM()->main_thread == target_th) {
 	rb_raise(rb_eThreadError, "Target thread must not be main thread");
     }
+    /* When running trap handler */
+    if (th->interrupt_mask & TRAP_INTERRUPT_MASK) {
+	rb_raise(rb_eThreadError, "can't be called from trap context");
+    }
 
     arg.target = target_th;
     arg.waiting = th;
@@ -822,15 +826,9 @@ static VALUE
 thread_join_m(int argc, VALUE *argv, VALUE self)
 {
     rb_thread_t *target_th;
-    rb_thread_t *cur_th = GET_THREAD();
     double delay = DELAY_INFTY;
     VALUE limit;
 
-    /* When running trap handler */
-    if (cur_th->interrupt_mask & TRAP_INTERRUPT_MASK) {
-	rb_raise(rb_eThreadError, "can't be called from trap context");
-    }
-
     GetThreadPtr(self, target_th);
 
     rb_scan_args(argc, argv, "01", &limit);