Skip to content

improves BaseDuplexConnection and fixes PingClient impl #1062

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
OlegDokuka merged 1 commit into from
Aug 20, 2022
Merged

improves BaseDuplexConnection and fixes PingClient impl #1062

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
11 changes: 4 additions & 7 deletions rsocket-core/src/main/java/io/rsocket/internal/BaseDuplexConnection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,10 @@
import reactor.core.publisher.Sinks;

public abstract class BaseDuplexConnection implements DuplexConnection {
protected Sinks.Empty<Void> onClose = Sinks.empty();
protected final Sinks.Empty<Void> onClose = Sinks.empty();
protected final UnboundedProcessor sender = new UnboundedProcessor(onClose::tryEmitEmpty);

protected UnboundedProcessor sender = new UnboundedProcessor();

public BaseDuplexConnection() {
onClose().doFinally(s -> doOnClose()).subscribe();
}
public BaseDuplexConnection() {}

@Override
public void sendFrame(int streamId, ByteBuf frame) {
Expand All @@ -48,7 +45,7 @@ public final Mono<Void> onClose() {

@Override
public final void dispose() {
onClose.tryEmitEmpty();
doOnClose();
}

@Override
Expand Down
10 changes: 7 additions & 3 deletions rsocket-test/src/main/java/io/rsocket/test/PingClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,8 @@ Flux<Payload> pingPong(
BiFunction<RSocket, ? super Payload, ? extends Publisher<Payload>> interaction,
int count,
final Recorder histogram) {
return client
.flatMapMany(
return Flux.usingWhen(
client,
rsocket ->
Flux.range(1, count)
.flatMap(
Expand All @@ -78,7 +78,11 @@ Flux<Payload> pingPong(
histogram.recordValue(diff);
});
},
64))
64),
rsocket -> {
rsocket.dispose();
return rsocket.onClose();
})
.doOnError(Throwable::printStackTrace);
}
}