ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-16 10:58:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fixed #4206 and #4207 open and close notebook quickly issue #4240 (#4255)

Browse Source 
* Fixed  #4206 and #4207

* Check if it makes my PR run tests

* Add isReady to JupyterSessionManager
This commit is contained in:
Yurong He
2019-03-04 12:46:27 -08:00
committed by GitHub
parent b4984d7f2d
commit a48e9bc64c
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
extensions/notebook/src/jupyter/jupyterSessionManager.ts
View File

@@ -150,11 +150,16 @@ export class JupyterSessionManager implements nb.SessionManager {
} }
public shutdownAll(): Promise<void> { public shutdownAll(): Promise<void> {
return this._sessionManager.shutdownAll(); if (this._isReady) {
return this._sessionManager.shutdownAll();
}
return Promise.resolve();
} }
public dispose(): void { public dispose(): void {
this._sessionManager.dispose(); if (this._isReady) {
this._sessionManager.dispose();
}
} }
} }

2
src/sql/parts/notebook/models/notebookModel.ts
View File

@@ -728,7 +728,7 @@ export class NotebookModel extends Disposable implements INotebookModel {
for (let i = 0; i < this.notebookManagers.length; i++) { for (let i = 0; i < this.notebookManagers.length; i++) {
if (this.notebookManagers[i].sessionManager && this.notebookManagers[i].sessionManager.specs && this.notebookManagers[i].sessionManager.specs.kernels) { if (this.notebookManagers[i].sessionManager && this.notebookManagers[i].sessionManager.specs && this.notebookManagers[i].sessionManager.specs.kernels) {
let index = this.notebookManagers[i].sessionManager.specs.kernels.findIndex(kernel => kernel.name === kernelSpec.name); let index = this.notebookManagers[i].sessionManager.specs.kernels.findIndex(kernel => kernel.name === kernelSpec.name);
if (index >= 0) { if (index >= 0 && this._clientSessions && this._clientSessions.length > 0) {
if (this._activeClientSession) { if (this._activeClientSession) {
this._oldClientSession = this._activeClientSession; this._oldClientSession = this._activeClientSession;
} }