Fix null ref error when no database or server node are in object tree (#1790)

- Also fixed minor issue where `var` was used instead of `let` in a related file, since this is discouraged in our codebase.
This commit is contained in:
Kevin Cunnane
2018-06-29 16:49:46 -07:00
committed by GitHub
parent 1819036d7d
commit 335f667507
2 changed files with 7 additions and 7 deletions

View File

@@ -96,11 +96,11 @@ export class TreeNode {
return undefined;
}
var currentNode: TreeNode = this;
while (currentNode.nodeTypeId !== NodeType.Database && currentNode.nodeTypeId !== NodeType.Server) {
while (currentNode.nodeTypeId !== NodeType.Database && currentNode.nodeTypeId !== NodeType.Server && currentNode.parent) {
currentNode = currentNode.parent;
}
if (currentNode.nodeTypeId === NodeType.Database) {
if (currentNode && currentNode.nodeTypeId === NodeType.Database) {
return currentNode.metadata ? currentNode.metadata.name : null;
}
return undefined;