Skip to content

Commit b89aa74

Browse files
Merge pull request #629 from rsocket/bugfix/stop-keep-alive-on-disconnect
actually stop keep-alive on closed connection
2 parents 350da17 + 62d0ad7 commit b89aa74

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

build.gradle

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,10 @@ subprojects {
116116

117117
systemProperty "io.netty.leakDetection.level", "ADVANCED"
118118
}
119+
120+
tasks.named("javadoc").configure {
121+
onlyIf { System.getenv('SKIP_RELEASE') != "true" }
122+
}
119123
}
120124

121125
plugins.withType(JavaLibraryPlugin) {

rsocket-core/src/main/java/io/rsocket/keepalive/KeepAliveHandler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public KeepAliveFramesAcceptor start(
2525
KeepAliveSupport keepAliveSupport,
2626
Consumer<ByteBuf> onSendKeepAliveFrame,
2727
Consumer<KeepAlive> onTimeout) {
28-
duplexConnection.onClose().subscribe(v -> keepAliveSupport.stop());
28+
duplexConnection.onClose().doFinally(s -> keepAliveSupport.stop()).subscribe();
2929
return keepAliveSupport
3030
.onSendKeepAliveFrame(onSendKeepAliveFrame)
3131
.onTimeout(onTimeout)

0 commit comments

Comments
 (0)