Need exceptions booted to set up the sync classes. #4293

jruby · Nov 17, 2016 · 2b59c96 · 2b59c96
1 parent 8717e69
commit 2b59c96
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/core/src/main/java/org/jruby/Ruby.java b/core/src/main/java/org/jruby/Ruby.java
@@ -52,6 +52,9 @@
 import org.jruby.ast.WhileNode;
 import org.jruby.compiler.Constantizable;
 import org.jruby.compiler.NotCompilableException;
+import org.jruby.ext.thread.ConditionVariable;
+import org.jruby.ext.thread.Mutex;
+import org.jruby.ext.thread.SizedQueue;
 import org.jruby.ir.IRScope;
 import org.jruby.ir.IRScriptBody;
 import org.jruby.javasupport.JavaSupport;
@@ -1679,6 +1682,10 @@ private void initExceptions() {
     }
 
     private void initLibraries() {
+        Mutex.setup(this);
+        ConditionVariable.setup(this);
+        org.jruby.ext.thread.Queue.setup(this);
+        SizedQueue.setup(this);
         new ThreadFiberLibrary().load(this, false);
     }
 

diff --git a/core/src/main/java/org/jruby/RubyThread.java b/core/src/main/java/org/jruby/RubyThread.java
@@ -62,9 +62,6 @@
 import org.jruby.anno.JRubyMethod;
 import org.jruby.exceptions.RaiseException;
 import org.jruby.exceptions.ThreadKill;
-import org.jruby.ext.thread.ConditionVariable;
-import org.jruby.ext.thread.Mutex;
-import org.jruby.ext.thread.SizedQueue;
 import org.jruby.internal.runtime.NativeThread;
 import org.jruby.internal.runtime.RubyRunnable;
 import org.jruby.internal.runtime.ThreadLike;
@@ -439,11 +436,6 @@ public static RubyClass createThreadClass(Ruby runtime) {
         location.defineAnnotatedMethods(Location.class);
 
         runtime.setLocation(location);
-
-        Mutex.setup(runtime);
-        ConditionVariable.setup(runtime);
-        org.jruby.ext.thread.Queue.setup(runtime);
-        SizedQueue.setup(runtime);
 
         return threadClass;
     }