Skip to content
This repository was archived by the owner on May 4, 2019. It is now read-only.

Commit 1c29df3

Browse files
committed
Merge branch 'hotfix/1.5.5'
2 parents d99ff12 + 96fa6be commit 1c29df3

File tree

2 files changed

+2
-7
lines changed

2 files changed

+2
-7
lines changed

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
group=io.netifi.proteus
2-
version=1.5.4
2+
version=1.5.5

proteus-client/src/main/java/io/netifi/proteus/rsocket/WeightedReconnectingRSocket.java

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -190,22 +190,17 @@ private RSocketFactory.ClientRSocketFactory getClientFactory(Payload setupPayloa
190190
if (keepalive) {
191191
connect =
192192
connect
193-
.keepAlive()
194193
.keepAliveTickPeriod(Duration.ofSeconds(tickPeriodSeconds))
195194
.keepAliveAckTimeout(Duration.ofSeconds(ackTimeoutSeconds))
196195
.keepAliveMissedAcks(missedAcks);
197196
} else {
198197
connect
199-
.keepAlive()
200198
.keepAliveAckTimeout(Duration.ofSeconds(0))
201199
.keepAliveAckTimeout(Duration.ofSeconds(0))
202200
.keepAliveMissedAcks(missedAcks);
203201
}
204202

205-
return connect
206-
.setupPayload(setupPayload)
207-
.keepAliveAckTimeout(Duration.ofSeconds(0))
208-
.keepAliveTickPeriod(Duration.ofSeconds(0));
203+
return connect.setupPayload(setupPayload);
209204
}
210205

211206
void connect() {

0 commit comments

Comments
 (0)