address feedback
authorWraith2 <wraith2@gmail.com>
Tue, 12 Mar 2019 23:24:19 +0000 (23:24 +0000)
committerWraith2 <wraith2@gmail.com>
Tue, 12 Mar 2019 23:24:19 +0000 (23:24 +0000)
Commit migrated from https://github.com/dotnet/corefx/commit/f2417f59441b0dc55ad73deb75ff23672041aa5e

src/libraries/System.Data.SqlClient/src/System/Data/SqlClient/SqlParameter.cs

index f16ee44f4b9c1029697ede703f7ffbda79ce23d3..d1c66dcd77bfa6a121644d303919c2dec3fbc02d 100644 (file)
@@ -53,8 +53,8 @@ namespace System.Data.SqlClient
                 UnicodeEncoding encoding = s_defaultEncoding;
                 if (encoding is null)
                 {
-                    encoding = new UnicodeEncoding(false, false); ;
-                    Interlocked.CompareExchange(ref s_defaultEncoding, encoding, null);
+                    encoding = new UnicodeEncoding(false, false);
+                    encoding = Interlocked.CompareExchange(ref s_defaultEncoding, encoding, null) ?? encoding;
                 }
                 return encoding;
             }