Root fiber's parent should be main thread (itself). Fixes #4920

jruby · Jan 2, 2018 · e6a1e3a · e6a1e3a · chuckremes · Jan 2, 2018
1 parent 7f2c9be
commit e6a1e3a
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/core/src/main/java/org/jruby/ext/fiber/ThreadFiber.java b/core/src/main/java/org/jruby/ext/fiber/ThreadFiber.java
@@ -37,8 +37,9 @@ public static void initRootFiber(ThreadContext context) {
 
         ThreadFiber rootFiber = new ThreadFiber(runtime, runtime.getClass("Fiber")); // FIXME: getFiber()
 
-        rootFiber.data = new FiberData(new FiberQueue(runtime), null, rootFiber);
-        rootFiber.thread = context.getThread();
+        RubyThread currentThread = context.getThread();
+        rootFiber.data = new FiberData(new FiberQueue(runtime), currentThread, rootFiber);
+        rootFiber.thread = currentThread;
         context.setRootFiber(rootFiber);
     }