Fix sub/unsub/sub bug.

ReactiveX · Jun 5, 2013 · 22cd318 · 22cd318
1 parent 4f68c5a
commit 22cd318
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/rxjava-core/src/main/java/rx/operators/OperationGroupBy.java b/rxjava-core/src/main/java/rx/operators/OperationGroupBy.java
@@ -137,6 +137,7 @@ public void unsubscribe() {
                     if (numGroupSubscriptions.get() == 0) {
                         // if we have no group subscriptions we will unsubscribe
                         actualParentSubscription.unsubscribe();
+                    } else {
                         // otherwise we mark to not send any more groups (waiting on existing groups to finish)
                         unsubscribeRequested.set(true);
                     }
@@ -160,7 +161,7 @@ private void subscribeKey(K key) {
          */
         private void unsubscribeKey(K key) {
             int c = numGroupSubscriptions.decrementAndGet();
-            if (c == 0) {
+            if (c == 0 && unsubscribeRequested.get()) {
                 actualParentSubscription.unsubscribe();
             }
         }