Skip to content
Prev Previous commit
Next Next commit
Merge remote-tracking branch 'origin/master' into rchiodo/cdn_local
  • Loading branch information
rchiodo committed Apr 21, 2020
commit 83eb8dc55806697ad96d45eec6f984c3fc372f0f
18 changes: 1 addition & 17 deletions src/client/datascience/jupyter/jupyterSession.ts
Original file line number Diff line number Diff line change
Expand Up @@ -127,23 +127,7 @@ export class JupyterSession extends BaseJupyterSession {
throw new JupyterInvalidKernelError(kernel);
}

// This is just like doing a restart, kill the old session (and the old restart session), and start new ones
if (this.session) {
this.shutdownSession(this.session, this.statusHandler).ignoreErrors();
this.restartSessionPromise?.then((r) => this.shutdownSession(r, undefined)).ignoreErrors(); // NOSONAR
}

// Update our kernel spec
this.kernelSpec = kernel;

// Save the new session
this.session = newSession;

// Listen for session status changes
this.session?.statusChanged.connect(this.statusHandler); // NOSONAR

// Start the restart session promise too.
this.restartSessionPromise = this.createRestartSession(kernel, this.session);
return newSession;
}

protected async createRestartSession(
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.