Cast back Observer to Subscriber if passed to subscribe(Observer)

akarnokd · akarnokd · commit 2f58536a9ffc · 2015-02-06T12:44:56.000+01:00
diff --git a/src/main/java/rx/Observable.java b/src/main/java/rx/Observable.java
@@ -7289,6 +7289,9 @@ public final void onNext(T args) {
      * @see <a href="http://reactivex.io/documentation/operators/subscribe.html">ReactiveX operators documentation: Subscribe</a>
      */
     public final Subscription subscribe(final Observer<? super T> observer) {
+        if (observer instanceof Subscriber) {
+            return subscribe((Subscriber<? super T>)observer);
+        }
         return subscribe(new Subscriber<T>() {
 
             @Override
diff --git a/src/test/java/rx/ObservableTests.java b/src/test/java/rx/ObservableTests.java
@@ -1129,4 +1129,13 @@ public void testEmptyIsEmpty() {
         verify(w, never()).onNext(any(Integer.class));
         verify(w, never()).onError(any(Throwable.class));
     }
+    
+    @Test // cf. https://github.com/ReactiveX/RxJava/issues/2599
+    public void testSubscribingSubscriberAsObserverMaintainsSubscriptionChain() {
+        TestSubscriber<Object> subscriber = new TestSubscriber<Object>();
+        Subscription subscription = Observable.just("event").subscribe((Observer<Object>) subscriber);
+        subscription.unsubscribe();
+
+        subscriber.assertUnsubscribed();
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -1129,4 +1129,13 @@ public void testEmptyIsEmpty() {`
`1129`	`1129`	`verify(w, never()).onNext(any(Integer.class));`
`1130`	`1130`	`verify(w, never()).onError(any(Throwable.class));`
`1131`	`1131`	`}`
	`1132`	`+`
	`1133`	`+ @Test // cf. https://github.com/ReactiveX/RxJava/issues/2599`
	`1134`	`+ public void testSubscribingSubscriberAsObserverMaintainsSubscriptionChain() {`
	`1135`	`+ TestSubscriber<Object> subscriber = new TestSubscriber<Object>();`
	`1136`	`+ Subscription subscription = Observable.just("event").subscribe((Observer<Object>) subscriber);`
	`1137`	`+ subscription.unsubscribe();`
	`1138`	`+`
	`1139`	`+ subscriber.assertUnsubscribed();`
	`1140`	`+ }`
`1132`	`1141`	`}`