Skip to content

Commit 139a7f4

Browse files
committed
[SignalR] [Java] Log WebSocket stopped once
1 parent 0eaabe0 commit 139a7f4

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/HubConnection.java

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -433,15 +433,14 @@ private Completable stop(String errorMessage) {
433433
this.state.unlock();
434434
}
435435

436-
Completable stopTask = startTask.onErrorComplete().andThen(Completable.defer(() ->
436+
CompletableSubject subject = CompletableSubject.create();
437+
startTask.onErrorComplete().subscribe(() ->
437438
{
438439
Completable stop = connectionState.transport.stop();
439-
stop.onErrorComplete().subscribe();
440-
return stop;
441-
}));
442-
stopTask.onErrorComplete().subscribe();
440+
stop.subscribe(() -> subject.onComplete(), e -> subject.onError(e));
441+
});
443442

444-
return stopTask;
443+
return subject;
445444
}
446445

447446
private void ReceiveLoop(ByteBuffer payload)

src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/WebSocketTransport.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,9 @@ public void setOnClose(TransportOnClosedCallback onCloseCallback) {
8282

8383
@Override
8484
public Completable stop() {
85-
return webSocketClient.stop().doOnEvent(t -> logger.info("WebSocket connection stopped."));
85+
Completable stop = webSocketClient.stop();
86+
stop.onErrorComplete().subscribe(() -> logger.info("WebSocket connection stopped."));
87+
return stop;
8688
}
8789

8890
void onClose(Integer code, String reason) {

0 commit comments

Comments
 (0)