Skip to content

Commit 6681418

Browse files
kimlukaskim
and
kim
authored
Waiting when disposing till the stop message was sent (#635)
Co-authored-by: kim <kim.bechtold@webfactory-i4.de>
1 parent 6d1c010 commit 6681418

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

src/GraphQL.Client/Websocket/GraphQLTransportWSProtocolHandler.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ public IObservable<GraphQLResponse<TResponse>> CreateSubscriptionObservable<TRes
116116

117117
var disposable = new CompositeDisposable(
118118
observable.Subscribe(observer),
119-
Disposable.Create(async () =>
119+
Disposable.Create(() =>
120120
{
121121
Debug.WriteLine($"disposing subscription {startRequest.Id}, websocket state is '{_webSocketHandler.WebSocketState}'");
122122
// only try to send close request on open websocket
@@ -126,7 +126,7 @@ public IObservable<GraphQLResponse<TResponse>> CreateSubscriptionObservable<TRes
126126
try
127127
{
128128
Debug.WriteLine($"sending stop message on subscription {startRequest.Id}");
129-
await _queueWebSocketRequest(stopRequest).ConfigureAwait(false);
129+
_queueWebSocketRequest(stopRequest).GetAwaiter().GetResult();
130130
}
131131
// do not break on disposing
132132
catch (OperationCanceledException) { }

src/GraphQL.Client/Websocket/GraphQLWSProtocolHandler.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ public IObservable<GraphQLResponse<TResponse>> CreateSubscriptionObservable<TRes
101101

102102
var disposable = new CompositeDisposable(
103103
observable.Subscribe(observer),
104-
Disposable.Create(async () =>
104+
Disposable.Create(() =>
105105
{
106106
Debug.WriteLine($"disposing subscription {startRequest.Id}, websocket state is '{_webSocketHandler.WebSocketState}'");
107107
// only try to send close request on open websocket
@@ -111,7 +111,7 @@ public IObservable<GraphQLResponse<TResponse>> CreateSubscriptionObservable<TRes
111111
try
112112
{
113113
Debug.WriteLine($"sending stop message on subscription {startRequest.Id}");
114-
await _queueWebSocketRequest(stopRequest).ConfigureAwait(false);
114+
_queueWebSocketRequest(stopRequest).GetAwaiter().GetResult();
115115
}
116116
// do not break on disposing
117117
catch (OperationCanceledException) { }

0 commit comments

Comments
 (0)