Skip to content

4.x: Fix Streamable.fromStream not closing the Stream when the first hasNext fails #8331

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
akarnokd merged 1 commit into from
Oct 15, 2026
Merged

4.x: Fix Streamable.fromStream not closing the Stream when the first hasNext fails #8331

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 17 additions & 3 deletions src/main/java/io/reactivex/rxjava4/internal/operators/streamable/StreamableFromStream.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

package io.reactivex.rxjava4.internal.operators.streamable;

import java.util.Objects;
import java.util.*;
import java.util.stream.Stream;

import io.reactivex.rxjava4.annotations.NonNull;
Expand All @@ -27,8 +27,22 @@ public record StreamableFromStream<T>(@NonNull Stream<? extends T> items) implem
@SuppressWarnings("unchecked")
@Override
public @NonNull Streamer<@NonNull T> stream(@NonNull StreamerCancellation cancellation) {
var iterator = Objects.requireNonNull(items.iterator(), "iterator is null");
if (!iterator.hasNext()) {
Iterator<? extends T> iterator;
boolean hasNext;
try {
iterator = Objects.requireNonNull(items.iterator(), "iterator is null");
hasNext = iterator.hasNext();
} catch (Throwable ex) {
Exceptions.throwIfFatal(ex);
try {
items.close();
} catch (Throwable exc) {
Exceptions.throwIfFatal(exc);
ex.addSuppressed(exc);
}
return StreamableError.createFailed(ex);
}
if (!hasNext) {
try {
items.close();
} catch (Throwable ex) {
Expand Down
32 changes: 29 additions & 3 deletions ...est/java/io/reactivex/rxjava4/internal/operators/streamable/StreamableFromStreamTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,16 @@

package io.reactivex.rxjava4.internal.operators.streamable;

import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.*;

import java.util.*;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.*;
import java.util.stream.Stream;

import org.junit.jupiter.api.Test;

import io.reactivex.rxjava4.core.Streamable;
import io.reactivex.rxjava4.core.*;
import io.reactivex.rxjava4.exceptions.TestException;

public class StreamableFromStreamTest extends StreamableBaseTest {
Expand Down Expand Up @@ -120,4 +120,30 @@ public void ensureCloses2Crash() {

assertTrue(hasClosed.get(), "Close not called");
}

@Test
public void firstItemCrashCloses() {
var hasClosed = new AtomicBoolean();
Streamable.fromStream(Stream.of(1, 2, 3).<Integer>map(_ -> { throw new TestException(); })
.onClose(() -> hasClosed.set(true)))
.test()
.awaitDone(5, TimeUnit.SECONDS)
.assertFailure(TestException.class);

assertTrue(hasClosed.get(), "Close not called");
}

@Test
public void alreadyConsumedStreamSink() throws Throwable {
var stream = Stream.of(1, 2, 3);
stream.forEach(_ -> { });

var error = new AtomicReference<Throwable>();
Streamable.fromStream(stream)
.subscribe(StreamSink.create(_ -> Streamer.NEXT_TRUE, e -> { error.set(e); return Streamer.FINISHED; }))
.toCompletableFuture()
.get(5, TimeUnit.SECONDS);

assertInstanceOf(IllegalStateException.class, error.get());
}
}
Loading