ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-01-25 01:25:36 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix nullref exception in connection profile (#5330)

Browse Source 
* Fix nullref exception in connection profile

* Fix condition
This commit is contained in:
Karl Burtram
2019-05-02 16:04:03 -07:00
committed by GitHub
parent 1bfdce9642
commit 188ccf849d
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/sql/platform/connection/common/connectionProfile.ts
View File

@@ -58,14 +58,19 @@ export class ConnectionProfile extends ProviderConnectionInfo implements interfa
public matches(other: interfaces.IConnectionProfile): boolean {
return other
&& this.providerName === other.providerName
&& equalsIgnoreCase(this.serverName, other.serverName)
&& equalsIgnoreCase(this.databaseName, other.databaseName)
&& equalsIgnoreCase(this.userName, other.userName)
&& equalsIgnoreCase(this.options['databaseDisplayName'], other.options['databaseDisplayName'])
&& this.nullCheckEqualsIgnoreCase(this.serverName, other.serverName)
&& this.nullCheckEqualsIgnoreCase(this.databaseName, other.databaseName)
&& this.nullCheckEqualsIgnoreCase(this.userName, other.userName)
&& this.nullCheckEqualsIgnoreCase(this.options['databaseDisplayName'], other.options['databaseDisplayName'])
&& this.authenticationType === other.authenticationType
&& this.groupId === other.groupId;
}
private nullCheckEqualsIgnoreCase(a: string, b: string) {
let bothNull: boolean = !a && !b;
return bothNull ? bothNull : equalsIgnoreCase(a, b);
}
public generateNewId() {
this._id = generateUuid();
}