Filter null from futures before disposing

julienzarka · Nov 30, 2020 · 6adf61f · 6adf61f
1 parent d51576f
commit 6adf61f
Showing 1 changed file with 3 additions and 6 deletions.
diff --git a/packages/graphql/lib/src/links/websocket_link/websocket_client.dart b/packages/graphql/lib/src/links/websocket_link/websocket_client.dart
@@ -261,15 +261,12 @@ class SocketClient {
   Future<void> dispose() async {
     print('Disposing socket client..');
     _reconnectTimer?.cancel();
-    final closing = [
+    await Future.wait([
       socket?.close(),
       _messageSubscription?.cancel(),
       _connectionStateController?.close(),
-    ];
-    if (_keepAliveSubscription != null) {
-      closing.add(_keepAliveSubscription?.cancel());
-    }
-    await Future.wait(closing);
+      _keepAliveSubscription?.cancel()
+    ].where((future) => future != null).toList());
   }
 
   static GraphQLSocketMessage _parseSocketMessage(dynamic message) {