Fix blocking in SizedQueue#push

headius · Jan 3, 2024 · 18432dc · 18432dc
1 parent 4278f07
commit 18432dc
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/core/src/main/java/org/jruby/ext/thread/SizedQueue.java b/core/src/main/java/org/jruby/ext/thread/SizedQueue.java
@@ -142,13 +142,16 @@ public IRubyObject push(ThreadContext context, final IRubyObject arg0) {
     }
 
     @JRubyMethod(name = {"push", "<<", "enq"})
-    public IRubyObject push(ThreadContext context, final IRubyObject arg0, final IRubyObject arg1) {
+    public IRubyObject push(ThreadContext context, final IRubyObject arg0, final IRubyObject nonblock) {
         initializedCheck();
 
-        boolean should_block = arg1.isTrue();
-
         try {
-            return context.getThread().executeTaskBlocking(context, arg0, should_block ? blockingPushTask : nonblockingPushTask);
+            RubyThread thread = context.getThread();
+            if (nonblock.isTrue()) {
+                return thread.executeTask(context, arg0, nonblockingPushTask);
+            } else {
+                return thread.executeTaskBlocking(context, arg0, blockingPushTask);
+            }
         } catch (InterruptedException ie) {
             throw createInterruptedError(context, "push");
         }