From 6b5fa0c0f0233e67fc6bdb58fd6bd1cc9a9ae0cd Mon Sep 17 00:00:00 2001 From: Leo Camus Date: Wed, 18 Nov 2026 23:49:59 +0000 Subject: [PATCH] 4.x: Fix Streamable.intervalRange emitting nothing when start + count overflows intervalRange accepts start + count == Long.MAX_VALUE + 1, for example start = 1 with count = Long.MAX_VALUE, which the Javadoc suggests for an unlimited range. The streamer stored end = start + count, which wraps to Long.MIN_VALUE, so counterLocal >= end held right away and the sequence completed empty. Compare against the end through a subtraction so the wrapped end still works, as Flowable.intervalRange does with c == end. --- .../streamable/StreamableIntervalRange.java | 4 ++-- .../streamable/StreamableIntervalRangeTest.java | 17 +++++++++++++++++ 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/src/main/java/io/reactivex/rxjava4/internal/operators/streamable/StreamableIntervalRange.java b/src/main/java/io/reactivex/rxjava4/internal/operators/streamable/StreamableIntervalRange.java index c02fae8927..734b1d716e 100644 --- a/src/main/java/io/reactivex/rxjava4/internal/operators/streamable/StreamableIntervalRange.java +++ b/src/main/java/io/reactivex/rxjava4/internal/operators/streamable/StreamableIntervalRange.java @@ -87,7 +87,7 @@ static final class IntervalStreamer extends AtomicReference public void run() { var c = counterTask++; available = c; - if (c + 1 >= end) { + if (c + 1 - end >= 0) { DisposableHelper.dispose(this); } for (;;) { @@ -107,7 +107,7 @@ public void run() { public @NonNull CompletionStage next() { waiter.getAndSet(null); for (;;) { - if (counterLocal >= end) { + if (counterLocal - end >= 0) { return NEXT_FALSE; } var c = current; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/streamable/StreamableIntervalRangeTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/streamable/StreamableIntervalRangeTest.java index 9ad5a22cba..faa3db414b 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/streamable/StreamableIntervalRangeTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/streamable/StreamableIntervalRangeTest.java @@ -316,6 +316,23 @@ public void underNoOverflowLong() throws Throwable { Streamable.intervalRange(-2, Long.MAX_VALUE, 20, 20, TimeUnit.MILLISECONDS, Schedulers.single()); } + @Test + public void maxValueEnd() { + Streamable.intervalRange(Long.MAX_VALUE - 2, 3, 1, 1, TimeUnit.MILLISECONDS, Schedulers.single()) + .test() + .awaitDone(5, TimeUnit.SECONDS) + .assertResult(Long.MAX_VALUE - 2, Long.MAX_VALUE - 1, Long.MAX_VALUE); + } + + @Test + public void unlimitedFromOne() { + Streamable.intervalRange(1, Long.MAX_VALUE, 1, 1, TimeUnit.MILLISECONDS, Schedulers.single()) + .take(3) + .test() + .awaitDone(5, TimeUnit.SECONDS) + .assertResult(1L, 2L, 3L); + } + @Test public void underflowLongExec() throws Throwable { assertThrows(IllegalArgumentException.class, () -> {