Fixes #286: LangaueClient#handleConnectionClosed fails to restart if …

…this._resolvedConnection.dispose() throws
microsoft · Dec 7, 2017 · dfce081 · dfce081
1 parent b2a28e3
commit dfce081
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/client/src/client.ts b/client/src/client.ts
@@ -2740,12 +2740,21 @@ export abstract class BaseLanguageClient {
 		if (this.state === ClientState.Stopping || this.state === ClientState.Stopped) {
 			return;
 		}
-		if (this._resolvedConnection) {
-			this._resolvedConnection.dispose();
+		try {
+			if (this._resolvedConnection) {
+				this._resolvedConnection.dispose();
+			}
+		} catch (error) {
+			// Disposing a connection could fail if error cases.
+		}
+		let action = CloseAction.DoNotRestart;
+		try {
+			action = this._clientOptions.errorHandler!.closed();
+		} catch (error) {
+			// Ignore errors coming from the error handler.
 		}
 		this._connectionPromise = undefined;
 		this._resolvedConnection = undefined;
-		let action = this._clientOptions.errorHandler!.closed();
 		if (action === CloseAction.DoNotRestart) {
 			this.error('Connection to server got closed. Server will not be restarted.');
 			this.state = ClientState.Stopped;