2.x: Check runnable == null in *Scheduler.schedule*().

ReactiveX · Nov 30, 2017 · 9affb70 · 9affb70
1 parent 860e39e
commit 9affb70
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 5 deletions.
diff --git a/src/main/java/io/reactivex/internal/schedulers/TrampolineScheduler.java b/src/main/java/io/reactivex/internal/schedulers/TrampolineScheduler.java
@@ -49,13 +49,17 @@ public Worker createWorker() {
     @NonNull
     @Override
     public Disposable scheduleDirect(@NonNull Runnable run) {
+        // TODO remove if https://github.com/ReactiveX/RxJava/pull/5747 gets merged.
+        ObjectHelper.requireNonNull(run, "runnable is null");
         run.run();
         return EmptyDisposable.INSTANCE;
     }
 
     @NonNull
     @Override
     public Disposable scheduleDirect(@NonNull Runnable run, long delay, TimeUnit unit) {
+        // TODO remove if https://github.com/ReactiveX/RxJava/pull/5747 gets merged.
+        ObjectHelper.requireNonNull(run, "runnable is null");
         try {
             unit.sleep(delay);
             run.run();

diff --git a/src/main/java/io/reactivex/plugins/RxJavaPlugins.java b/src/main/java/io/reactivex/plugins/RxJavaPlugins.java
@@ -446,6 +446,8 @@ public static Scheduler onNewThreadScheduler(@NonNull Scheduler defaultScheduler
      */
     @NonNull
     public static Runnable onSchedule(@NonNull Runnable run) {
+        ObjectHelper.requireNonNull(run, "runnable is null");
+
         Function<? super Runnable, ? extends Runnable> f = onScheduleHandler;
         if (f == null) {
             return run;

diff --git a/src/test/java/io/reactivex/plugins/RxJavaPluginsTest.java b/src/test/java/io/reactivex/plugins/RxJavaPluginsTest.java
@@ -1369,8 +1369,6 @@ public void subscribeActual(CompletableObserver t) {
 
             assertNull(RxJavaPlugins.onAssembly((Maybe)null));
 
-            assertNull(RxJavaPlugins.onSchedule(null));
-
             Maybe myb = new Maybe() {
                 @Override
                 public void subscribeActual(MaybeObserver t) {
@@ -1381,10 +1379,7 @@ public void subscribeActual(MaybeObserver t) {
             assertSame(myb, RxJavaPlugins.onAssembly(myb));
 
 
-            assertNull(RxJavaPlugins.onSchedule(null));
-
             Runnable action = Functions.EMPTY_RUNNABLE;
-
             assertSame(action, RxJavaPlugins.onSchedule(action));
 
             class AllSubscriber implements Subscriber, Observer, SingleObserver, CompletableObserver, MaybeObserver {

diff --git a/src/test/java/io/reactivex/schedulers/AbstractSchedulerTests.java b/src/test/java/io/reactivex/schedulers/AbstractSchedulerTests.java
@@ -626,4 +626,34 @@ public void run() {
             }
         }
     }
+
+    @Test
+    public void scheduleDirectNullRunnable() {
+        try {
+            getScheduler().scheduleDirect(null);
+            fail();
+        } catch (NullPointerException npe) {
+            assertEquals("runnable is null", npe.getMessage());
+        }
+    }
+
+    @Test
+    public void scheduleDirectWithDelayNullRunnable() {
+        try {
+            getScheduler().scheduleDirect(null, 10, TimeUnit.MILLISECONDS);
+            fail();
+        } catch (NullPointerException npe) {
+            assertEquals("runnable is null", npe.getMessage());
+        }
+    }
+
+    @Test
+    public void schedulePeriodicallyDirectNullRunnable() {
+        try {
+            getScheduler().schedulePeriodicallyDirect(null, 5, 10, TimeUnit.MILLISECONDS);
+            fail();
+        } catch (NullPointerException npe) {
+            assertEquals("runnable is null", npe.getMessage());
+        }
+    }
 }