From 5bf26c9e4803e977f4ca145a6fdc76ab4fe7f961 Mon Sep 17 00:00:00 2001 From: Imam Date: Mon, 26 Aug 2019 17:45:52 +0530 Subject: [PATCH 1/3] Handling error during selecting a kernel --- packages/apputils/src/clientsession.tsx | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/apputils/src/clientsession.tsx b/packages/apputils/src/clientsession.tsx index 397bff7fde75..e77b82b6427a 100644 --- a/packages/apputils/src/clientsession.tsx +++ b/packages/apputils/src/clientsession.tsx @@ -623,7 +623,11 @@ export class ClientSession implements IClientSession { }); } if (model) { - return this._changeKernel(model).then(() => undefined); + return this._changeKernel(model).then(() => undefined) + .catch( err => { + this._handleSessionError(err); + return Promise.reject(err); + }); } }) .then(() => { From c5a67bc6c5406eefc6e4fd38d712e595bb13210b Mon Sep 17 00:00:00 2001 From: Imam Date: Tue, 27 Aug 2019 14:28:32 +0530 Subject: [PATCH 2/3] Handling error in change kernel rather than in select kernel --- packages/apputils/src/clientsession.tsx | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/packages/apputils/src/clientsession.tsx b/packages/apputils/src/clientsession.tsx index e77b82b6427a..b8e73f8c7b21 100644 --- a/packages/apputils/src/clientsession.tsx +++ b/packages/apputils/src/clientsession.tsx @@ -585,7 +585,7 @@ export class ClientSession implements IClientSession { } let session = this._session; if (session && session.status !== 'dead') { - return session.changeKernel(options); + return session.changeKernel(options).catch(err => { this._handleSessionError(err); return Promise.reject(err);}); } else { return this._startSession(options); } @@ -623,11 +623,7 @@ export class ClientSession implements IClientSession { }); } if (model) { - return this._changeKernel(model).then(() => undefined) - .catch( err => { - this._handleSessionError(err); - return Promise.reject(err); - }); + return this._changeKernel(model).then(() => undefined); } }) .then(() => { From 78f46b57ce9db55b70670a119a5a8683a6fd8f14 Mon Sep 17 00:00:00 2001 From: Imam Date: Tue, 27 Aug 2019 14:35:08 +0530 Subject: [PATCH 3/3] Fixing lint errors --- packages/apputils/src/clientsession.tsx | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/apputils/src/clientsession.tsx b/packages/apputils/src/clientsession.tsx index b8e73f8c7b21..c3a081b06daf 100644 --- a/packages/apputils/src/clientsession.tsx +++ b/packages/apputils/src/clientsession.tsx @@ -585,7 +585,10 @@ export class ClientSession implements IClientSession { } let session = this._session; if (session && session.status !== 'dead') { - return session.changeKernel(options).catch(err => { this._handleSessionError(err); return Promise.reject(err);}); + return session.changeKernel(options).catch(err => { + void this._handleSessionError(err); + return Promise.reject(err); + }); } else { return this._startSession(options); }