1.x: Add null check to Observable.switchIfEmpty (ReactiveX#4791)

ortex · akarnokd · commit c65b3db77f56 · 2016-11-01T15:32:04.000+01:00
* Add null check to switchIfEmpty (ReactiveX#4762) * Add null check to switchIfEmpty (ReactiveX#4762); add test
diff --git a/src/main/java/rx/Observable.java b/src/main/java/rx/Observable.java
@@ -5403,9 +5403,14 @@ public final Observable<T> defaultIfEmpty(final T defaultValue) {
      *              the alternate Observable to subscribe to if the source does not emit any items
      * @return  an Observable that emits the items emitted by the source Observable or the items of an
      *          alternate Observable if the source Observable is empty.
+     * @throws NullPointerException
+     *              if {@code alternate} is null
      * @since 1.1.0
      */
     public final Observable<T> switchIfEmpty(Observable<? extends T> alternate) {
+        if (alternate == null) {
+            throw new NullPointerException("alternate is null");
+        }
         return lift(new OperatorSwitchIfEmpty<T>(alternate));
     }
 
diff --git a/src/test/java/rx/internal/operators/OperatorSwitchIfEmptyTest.java b/src/test/java/rx/internal/operators/OperatorSwitchIfEmptyTest.java
@@ -207,4 +207,9 @@ public void call() {
         ts.assertValueCount(2);
         ts.unsubscribe();
     }
+
+    @Test(expected = NullPointerException.class)
+    public void testAlternateNull() {
+        Observable.just(1).switchIfEmpty(null);
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -207,4 +207,9 @@ public void call() {`
`207`	`207`	`ts.assertValueCount(2);`
`208`	`208`	`ts.unsubscribe();`
`209`	`209`	`}`
	`210`	`+`
	`211`	`+ @Test(expected = NullPointerException.class)`
	`212`	`+ public void testAlternateNull() {`
	`213`	`+ Observable.just(1).switchIfEmpty(null);`
	`214`	`+ }`
`210`	`215`	`}`