Fixed Zip issue with infinite streams.

rickbw · Nov 30, 2013 · 8deba28 · 8deba28
1 parent e17ae00
commit 8deba28
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/rxjava-core/src/main/java/rx/operators/OperationZip.java b/rxjava-core/src/main/java/rx/operators/OperationZip.java
@@ -445,8 +445,9 @@ public void onNext(T value) {
                                     if (io.done) {
                                         observer.onCompleted();
                                         cancel.unsubscribe();
+                                        return;
                                     }
-                                    return;
+                                    continue;
                                 }
                                 Object v = io.queue.peek();
                                 if (v == NULL_SENTINEL) {
@@ -459,6 +460,8 @@ public void onNext(T value) {
                                     io.queue.poll();
                                 }
                                 observer.onNext(values);
+                            } else {
+                            	break;
                             }
                         }
                     } finally {