Skip to content

Commit f109b3e

Browse files
committed
Fixed Zip issue with infinite streams.
1 parent 13cd6a9 commit f109b3e

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

rxjava-core/src/main/java/rx/operators/OperationZip.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -445,8 +445,9 @@ public void onNext(T value) {
445445
if (io.done) {
446446
observer.onCompleted();
447447
cancel.unsubscribe();
448+
return;
448449
}
449-
return;
450+
continue;
450451
}
451452
Object v = io.queue.peek();
452453
if (v == NULL_SENTINEL) {
@@ -459,6 +460,8 @@ public void onNext(T value) {
459460
io.queue.poll();
460461
}
461462
observer.onNext(values);
463+
} else {
464+
break;
462465
}
463466
}
464467
} finally {

0 commit comments

Comments
 (0)