Update as per review

kiran-mk · Dec 16, 2014 · 31281b6 · 31281b6
1 parent 83fc06f
commit 31281b6
Showing 1 changed file with 3 additions and 6 deletions.
diff --git a/src/main/java/rx/internal/operators/OperatorGroupBy.java b/src/main/java/rx/internal/operators/OperatorGroupBy.java
@@ -399,14 +399,11 @@ private void completeInner() {
             if (WIP_FOR_UNSUBSCRIBE_UPDATER.decrementAndGet(this) == 0) {
                 // It means `groups.isEmpty() && child.isUnsubscribed()` is true
                 unsubscribe();
-            }
-            // if we have no outstanding groups (all completed or unsubscribe) and terminated on outer
-            if (groups.isEmpty() && terminated == TERMINATED_WITH_COMPLETED) {
+            } else if (groups.isEmpty() && terminated == TERMINATED_WITH_COMPLETED) {
+                // if we have no outstanding groups (all completed or unsubscribe) and terminated on outer
                 // completionEmitted ensures we only emit onCompleted once
                 if (COMPLETION_EMITTED_UPDATER.compareAndSet(this, 0, 1)) {
-                    if (!child.isUnsubscribed()) {
-                        child.onCompleted();
-                    }
+                    child.onCompleted();
                 }
             }
         }