Merge pull request #1951 from abersnaze/unnecessary

Remove extraneous request(n) and onCompleted() calls when unsubscribed.
ReactiveX · Dec 12, 2014 · 1b39e6b · 1b39e6b
2 parents f934706 + 332b67c
commit 1b39e6b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/main/java/rx/internal/operators/OnSubscribeFromIterable.java b/src/main/java/rx/internal/operators/OnSubscribeFromIterable.java
@@ -98,7 +98,9 @@ public void request(long n) {
                         }
 
                         if (!it.hasNext()) {
-                            o.onCompleted();
+                            if (!o.isUnsubscribed()) {
+                                o.onCompleted();
+                            }
                             return;
                         }
                         if (REQUESTED_UPDATER.addAndGet(this, -r) == 0) {

diff --git a/src/main/java/rx/internal/operators/OperatorMerge.java b/src/main/java/rx/internal/operators/OperatorMerge.java
@@ -186,7 +186,8 @@ private void handleNewSource(Observable<? extends T> t) {
             InnerSubscriber<T> i = new InnerSubscriber<T>(this, producerIfNeeded);
             i.sindex = childrenSubscribers.add(i);
             t.unsafeSubscribe(i);
-            request(1);
+            if (!isUnsubscribed())
+                request(1);
         }
 
         private void handleScalarSynchronousObservable(ScalarSynchronousObservable<? extends T> t) {