From ba7407498e3fd749f1413b52b041c0a0f6bcd20b Mon Sep 17 00:00:00 2001
From: akarnokd <akarnokd@gmail.com>
Date: Mon, 22 Jun 2026 09:37:47 +0200
Subject: [PATCH] 4.x: Scheduler.toExecutorService(boolean) logic fix

---
 .../java/io/reactivex/rxjava4/core/Scheduler.java  | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/main/java/io/reactivex/rxjava4/core/Scheduler.java b/src/main/java/io/reactivex/rxjava4/core/Scheduler.java
index 55badacf08..baeecdaad5 100644
--- a/src/main/java/io/reactivex/rxjava4/core/Scheduler.java
+++ b/src/main/java/io/reactivex/rxjava4/core/Scheduler.java
@@ -383,9 +383,9 @@ public <S extends Scheduler & Disposable> S when(@NonNull Function<Flowable<Flow
     }
 
     /**
-     * Turn this Scheduler into an ExecutorService implementation
+     * Turn this {@code Scheduler} into an {@link ExecutorService} implementation
      * using its various *Direct() methods instead of workers.
-     * @return the ExecutorService view of this Scheduler
+     * @return the {@code ExecutorService} view of this {@code Scheduler}
      * @since 4.0.0
      */
     public ExecutorService toExecutorService() {
@@ -393,16 +393,16 @@ public ExecutorService toExecutorService() {
     }
 
     /**
-     * Turn this Scheduler into an ExecutorService implementation
-     * using its various *Direct() methods or worker methods,
+     * Turn this Scheduler into an {@link ExecutorService} implementation
+     * using its various *Direct() methods or {@link Worker} methods,
      * depending on the parameter.
-     * @param useWorker if true, one of the workers is used as an executorservice,
+     * @param useWorker if true, one of the {@code Worker} is used as an {@code ExecutorService},
      *                  if false, the whole scheduler and its *Direct methods are used.
-     * @return the ExecutorService view of this Scheduler
+     * @return the {@code ExecutorService} view of this {@code Scheduler}
      * @since 4.0.0
      */
     public ExecutorService toExecutorService(boolean useWorker) {
-        return new SchedulerToExecutorService(this, new AtomicReference<>());
+        return new SchedulerToExecutorService(this, new AtomicReference<>(useWorker ? createWorker() : null));
     }
 
     /**