From 22c9cc49f15f93e11205f1b886dcdb68ad5b611b Mon Sep 17 00:00:00 2001 From: SimonCropp Date: Tue, 7 Apr 2020 17:24:34 +1000 Subject: [PATCH 1/2] remov redundant DbConnectionPoolKey gettype --- .../Common/src/Microsoft/Data/Common/DbConnectionPoolKey.cs | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/Microsoft.Data.SqlClient/netfx/src/Common/src/Microsoft/Data/Common/DbConnectionPoolKey.cs b/src/Microsoft.Data.SqlClient/netfx/src/Common/src/Microsoft/Data/Common/DbConnectionPoolKey.cs index f47f62116e..0334016847 100644 --- a/src/Microsoft.Data.SqlClient/netfx/src/Common/src/Microsoft/Data/Common/DbConnectionPoolKey.cs +++ b/src/Microsoft.Data.SqlClient/netfx/src/Common/src/Microsoft/Data/Common/DbConnectionPoolKey.cs @@ -43,14 +43,12 @@ internal virtual string ConnectionString public override bool Equals(object obj) { - if (obj == null || obj.GetType() != typeof(DbConnectionPoolKey)) + if (obj == null) { return false; } - DbConnectionPoolKey key = obj as DbConnectionPoolKey; - - return (key != null && _connectionString == key._connectionString); + return (obj is DbConnectionPoolKey key && _connectionString == key._connectionString); } public override int GetHashCode() From f598be5704a0e7fc0605cdba3e3dfd0903b852fc Mon Sep 17 00:00:00 2001 From: SimonCropp Date: Wed, 8 Apr 2020 08:20:27 +1000 Subject: [PATCH 2/2] Update DbConnectionPoolKey.cs --- .../Common/src/Microsoft/Data/Common/DbConnectionPoolKey.cs | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/Microsoft.Data.SqlClient/netcore/src/Common/src/Microsoft/Data/Common/DbConnectionPoolKey.cs b/src/Microsoft.Data.SqlClient/netcore/src/Common/src/Microsoft/Data/Common/DbConnectionPoolKey.cs index 2d8f3017df..7d2799289f 100644 --- a/src/Microsoft.Data.SqlClient/netcore/src/Common/src/Microsoft/Data/Common/DbConnectionPoolKey.cs +++ b/src/Microsoft.Data.SqlClient/netcore/src/Common/src/Microsoft/Data/Common/DbConnectionPoolKey.cs @@ -42,14 +42,12 @@ internal virtual string ConnectionString public override bool Equals(object obj) { - if (obj == null || obj.GetType() != typeof(DbConnectionPoolKey)) + if (obj == null) { return false; } - DbConnectionPoolKey key = obj as DbConnectionPoolKey; - - return (key != null && _connectionString == key._connectionString); + return (obj is DbConnectionPoolKey key && _connectionString == key._connectionString); } public override int GetHashCode()