From 485cb43a3441aca52dd51e52ef47e387f751369f Mon Sep 17 00:00:00 2001 From: Aditya Bist Date: Thu, 5 Sep 2019 15:36:51 -0700 Subject: [PATCH] fix issue where sometimes ownerUri was null (#7094) --- .../cms/src/cmsResource/tree/cmsResourceTreeNode.ts | 13 ++++++------- extensions/cms/src/cmsResource/tree/treeProvider.ts | 2 +- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/extensions/cms/src/cmsResource/tree/cmsResourceTreeNode.ts b/extensions/cms/src/cmsResource/tree/cmsResourceTreeNode.ts index a95ca1025f..cdb377b436 100644 --- a/extensions/cms/src/cmsResource/tree/cmsResourceTreeNode.ts +++ b/extensions/cms/src/cmsResource/tree/cmsResourceTreeNode.ts @@ -43,13 +43,12 @@ export class CmsResourceTreeNode extends CmsResourceTreeNodeBase { this.connection.options.password = await this.appContext.cmsUtils.getPassword(this.connection.options.user); } } - return this.appContext.cmsUtils.createCmsServer(this.connection, this.name, this.description).then((result) => { - // cache new connection is different from old one - if (this.appContext.cmsUtils.didConnectionChange(this._connection, result.connection)) { - this._connection = result.connection; - this._ownerUri = result.ownerUri; - this.appContext.cmsUtils.cacheRegisteredCmsServer(this.name, this.description, this.ownerUri, this.connection); - } + return this.appContext.cmsUtils.createCmsServer(this.connection, this.name, this.description).then(async (result) => { + // update the owner uri and the connection + this._ownerUri = result.ownerUri; + this._connection = result.connection; + await this.appContext.cmsUtils.cacheRegisteredCmsServer(this.name, this.description, this.ownerUri, this.connection); + if (result.listRegisteredServersResult.registeredServersList) { result.listRegisteredServersResult.registeredServersList.forEach((registeredServer) => { nodes.push(new RegisteredServerTreeNode( diff --git a/extensions/cms/src/cmsResource/tree/treeProvider.ts b/extensions/cms/src/cmsResource/tree/treeProvider.ts index 6c2938d4ce..89ce18b037 100644 --- a/extensions/cms/src/cmsResource/tree/treeProvider.ts +++ b/extensions/cms/src/cmsResource/tree/treeProvider.ts @@ -46,7 +46,7 @@ export class CmsResourceTreeProvider implements TreeDataProvider, ICms server.ownerUri, server.connection, this._appContext, this, null)); - this.appContext.cmsUtils.cacheRegisteredCmsServer(server.name, server.description, + await this.appContext.cmsUtils.cacheRegisteredCmsServer(server.name, server.description, server.ownerUri, server.connection); }); return servers;