jruby · Feb 9, 2016 · Feb 9, 2016 · Feb 9, 2016 · Feb 9, 2016
Showing with 10 additions and 2 deletions.

+7 −1 core/src/main/java/org/jruby/RubyThread.java

+2 −1 test/mri/excludes/TestThread.rb

+1 −0 test/mri/ruby/test_thread.rb
diff --git a/core/src/main/java/org/jruby/RubyThread.java b/core/src/main/java/org/jruby/RubyThread.java
@@ -931,6 +931,8 @@ public synchronized IRubyObject thread_variable_get(ThreadContext context, IRuby
 
     @JRubyMethod(name = "thread_variable_set", required = 2)
     public synchronized IRubyObject thread_variable_set(ThreadContext context, IRubyObject key, IRubyObject value) {
+        checkFrozen();
+
         key = getSymbolKey(key);
 
         getThreadLocals(context).put(key, value);
@@ -1000,6 +1002,8 @@ public IRubyObject join(ThreadContext context, IRubyObject[] args) {
         RubyThread currentThread = context.getThread();
 
         try {
+            currentThread.enterSleep();
+
             if (runtime.getThreadService().getCritical()) {
                 // If the target thread is sleeping or stopped, wake it
                 synchronized (this) {
@@ -1036,6 +1040,8 @@ public IRubyObject join(ThreadContext context, IRubyObject[] args) {
         } catch (ExecutionException ie) {
             ie.printStackTrace();
             assert false : ie;
+        } finally {
+            currentThread.exitSleep();
         }
 
         if (exitingException != null) {
@@ -1057,7 +1063,7 @@ public IRubyObject join(ThreadContext context, IRubyObject[] args) {
 
     @JRubyMethod
     public IRubyObject value() {
-        join(NULL_ARRAY);
+        join(getRuntime().getCurrentContext(), NULL_ARRAY);
         synchronized (this) {
             return finalResult;
         }

diff --git a/test/mri/excludes/TestThread.rb b/test/mri/excludes/TestThread.rb
@@ -2,4 +2,5 @@
 exclude(/_stack_size$/, 'often too expensive')
 exclude :test_mutex_interrupt, "hangs"
 exclude :test_safe_level, "SAFE levels are unsupported"
-exclude :test_thread_join_main_thread, "hangs"
+exclude :test_thread_join_main_thread, "hangs"
+exclude :test_thread_variable_in_enumerator, "fibers in JRuby have their own Thread.current"
diff --git a/test/mri/ruby/test_thread.rb b/test/mri/ruby/test_thread.rb
@@ -1053,6 +1053,7 @@ def initialize
   def test_thread_name
     t = Thread.start {sleep}
     assert_nil t.name
+    Thread.pass until t.stop?
     s = t.inspect
     t.name = 'foo'
     assert_equal 'foo', t.name