Observable.timeout/Flowable.timeout should unsubscribe from underlying subscription on dispose

src/main/java/io/reactivex/internal/operators/flowable/FlowableTimeoutTimed.java

@@ -252,7 +252,6 @@ void scheduleTimeout(final long idx) {
                     public void run() {
                         if (idx == index) {
                             done = true;
-                            s.cancel();
                             dispose();
 
                             actual.onError(new TimeoutException());
@@ -293,6 +292,7 @@ public void onComplete() {
         public void dispose() {
             worker.dispose();
             DisposableHelper.dispose(timer);
+            s.cancel();
         }
 
         @Override

src/main/java/io/reactivex/internal/operators/observable/ObservableTimeoutTimed.java

@@ -251,7 +251,6 @@ void scheduleTimeout(final long idx) {
                     public void run() {
                         if (idx == index) {
                             done = true;
-                            s.dispose();
                             dispose();
 
                             actual.onError(new TimeoutException());
@@ -292,6 +291,7 @@ public void onComplete() {
         public void dispose() {
             worker.dispose();
             DisposableHelper.dispose(timer);
+            s.dispose();
         }
 
         @Override

src/test/java/io/reactivex/internal/operators/completable/CompletableTimeoutTest.java

@@ -14,9 +14,14 @@
 package io.reactivex.internal.operators.completable;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 import java.util.concurrent.*;
 
+import io.reactivex.schedulers.TestScheduler;
+import io.reactivex.subjects.PublishSubject;
+import io.reactivex.subscribers.TestSubscriber;
 import org.junit.Test;
 
 import io.reactivex.Completable;
@@ -56,4 +61,20 @@ public void run() throws Exception {
         assertEquals(1, call[0]);
     }
 
+    @Test
+    public void shouldUnsubscribeFromUnderlyingSubscriptionOnDispose() {
+        final PublishSubject<String> subject = PublishSubject.create();
+        final TestScheduler scheduler = new TestScheduler();
+
+        final TestSubscriber<Void> observer = subject.toCompletable()
+                .timeout(100, TimeUnit.MILLISECONDS, scheduler)
+                .test();
+
+        assertTrue(subject.hasObservers());
+
+        observer.dispose();
+
+        assertFalse(subject.hasObservers());
+    }
+
 }

src/test/java/io/reactivex/internal/operators/flowable/FlowableTimeoutTests.java

@@ -13,6 +13,8 @@
 
 package io.reactivex.internal.operators.flowable;
 
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 import static org.mockito.Matchers.*;
 import static org.mockito.Mockito.*;
 
@@ -358,6 +360,21 @@ public void subscribe(Subscriber<? super String> subscriber) {
         verify(s, times(1)).cancel();
     }
 
+    @Test
+    public void shouldUnsubscribeFromUnderlyingSubscriptionOnDispose() {
+        final PublishProcessor<String> subject = PublishProcessor.create();
+        final TestScheduler scheduler = new TestScheduler();
+
+        final TestSubscriber<String> observer = subject
+                .timeout(100, TimeUnit.MILLISECONDS, scheduler)
+                .test();
+
+        assertTrue(subject.hasSubscribers());
+
+        observer.dispose();
+
+        assertFalse(subject.hasSubscribers());
+    }
 
     @Test
     public void timedAndOther() {

src/test/java/io/reactivex/internal/operators/observable/ObservableTimeoutTests.java

@@ -13,6 +13,8 @@
 
 package io.reactivex.internal.operators.observable;
 
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 import static org.mockito.Matchers.*;
 import static org.mockito.Mockito.*;
 
@@ -357,6 +359,22 @@ public void subscribe(Observer<? super String> NbpSubscriber) {
         verify(s, times(1)).dispose();
     }
 
+    @Test
+    public void shouldUnsubscribeFromUnderlyingSubscriptionOnDispose() {
+        final PublishSubject<String> subject = PublishSubject.create();
+        final TestScheduler scheduler = new TestScheduler();
+
+        final TestObserver<String> observer = subject
+                .timeout(100, TimeUnit.MILLISECONDS, scheduler)
+                .test();
+
+        assertTrue(subject.hasObservers());
+
+        observer.dispose();
+
+        assertFalse(subject.hasObservers());
+    }
+
     @Test
     public void timedAndOther() {
         Observable.never().timeout(100, TimeUnit.MILLISECONDS, Observable.just(1))

src/test/java/io/reactivex/internal/operators/single/SingleTimeoutTests.java

@@ -0,0 +1,44 @@
+/**
+ * Copyright 2016 Netflix, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.internal.operators.single;
+
+import io.reactivex.schedulers.TestScheduler;
+import io.reactivex.subjects.PublishSubject;
+import io.reactivex.subscribers.TestSubscriber;
+import org.junit.Test;
+
+import java.util.concurrent.TimeUnit;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+public class SingleTimeoutTests {
+
+    @Test
+    public void shouldUnsubscribeFromUnderlyingSubscriptionOnDispose() {
+        final PublishSubject<String> subject = PublishSubject.create();
+        final TestScheduler scheduler = new TestScheduler();
+
+        final TestSubscriber<String> observer = subject.toSingle()
+                .timeout(100, TimeUnit.MILLISECONDS, scheduler)
+                .test();
+
+        assertTrue(subject.hasObservers());
+
+        observer.dispose();
+
+        assertFalse(subject.hasObservers());
+    }
+
+}