Skip to content

Commit efb7f79

Browse files
Merge pull request ReactiveX#1530 from zsxwing/issue-merge
Fix the unbounded check for merge
2 parents 08bf50f + 334de61 commit efb7f79

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

rxjava-core/src/main/java/rx/internal/operators/OperatorMerge.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ private void handleScalarSynchronousObservable(ScalarSynchronousObservable<? ext
210210
* } </pre>
211211
*
212212
*/
213-
if (mergeProducer.requested < 0) {
213+
if (mergeProducer.requested == Long.MAX_VALUE) {
214214
handleScalarSynchronousObservableWithoutRequestLimits(t);
215215
} else {
216216
handleScalarSynchronousObservableWithRequestLimits(t);
@@ -489,6 +489,9 @@ public MergeProducer(MergeSubscriber<T> ms) {
489489

490490
@Override
491491
public void request(long n) {
492+
if (requested == Long.MAX_VALUE) {
493+
return;
494+
}
492495
if (n == Long.MAX_VALUE) {
493496
requested = Long.MAX_VALUE;
494497
} else {

0 commit comments

Comments
 (0)