Waiting when disposing till the stop message was sent (#635)

Co-authored-by: kim <kim.bechtold@webfactory-i4.de>
graphql-dotnet · Apr 22, 2024 · 6681418 · 6681418
1 parent 6d1c010
commit 6681418
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/GraphQL.Client/Websocket/GraphQLTransportWSProtocolHandler.cs b/src/GraphQL.Client/Websocket/GraphQLTransportWSProtocolHandler.cs
@@ -116,7 +116,7 @@ public IObservable<GraphQLResponse<TResponse>> CreateSubscriptionObservable<TRes
 
             var disposable = new CompositeDisposable(
                 observable.Subscribe(observer),
-                Disposable.Create(async () =>
+                Disposable.Create(() =>
                 {
                     Debug.WriteLine($"disposing subscription {startRequest.Id}, websocket state is '{_webSocketHandler.WebSocketState}'");
                     // only try to send close request on open websocket
@@ -126,7 +126,7 @@ public IObservable<GraphQLResponse<TResponse>> CreateSubscriptionObservable<TRes
                     try
                     {
                         Debug.WriteLine($"sending stop message on subscription {startRequest.Id}");
-                        await _queueWebSocketRequest(stopRequest).ConfigureAwait(false);
+                        _queueWebSocketRequest(stopRequest).GetAwaiter().GetResult();
                     }
                     // do not break on disposing
                     catch (OperationCanceledException) { }

diff --git a/src/GraphQL.Client/Websocket/GraphQLWSProtocolHandler.cs b/src/GraphQL.Client/Websocket/GraphQLWSProtocolHandler.cs
@@ -101,7 +101,7 @@ public IObservable<GraphQLResponse<TResponse>> CreateSubscriptionObservable<TRes
 
             var disposable = new CompositeDisposable(
                 observable.Subscribe(observer),
-                Disposable.Create(async () =>
+                Disposable.Create(() =>
                 {
                     Debug.WriteLine($"disposing subscription {startRequest.Id}, websocket state is '{_webSocketHandler.WebSocketState}'");
                     // only try to send close request on open websocket
@@ -111,7 +111,7 @@ public IObservable<GraphQLResponse<TResponse>> CreateSubscriptionObservable<TRes
                     try
                     {
                         Debug.WriteLine($"sending stop message on subscription {startRequest.Id}");
-                        await _queueWebSocketRequest(stopRequest).ConfigureAwait(false);
+                        _queueWebSocketRequest(stopRequest).GetAwaiter().GetResult();
                     }
                     // do not break on disposing
                     catch (OperationCanceledException) { }