From: Wraith2 <wraith2@gmail.com>
Date: Tue, 12 Mar 2019 23:24:19 +0000 (+0000)
Subject: address feedback
X-Git-Tag: submit/tizen/20210909.063632~11031^2~2185^2~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9ef811fd2429e1af2e22cf679189898051e1fb54;p=platform%2Fupstream%2Fdotnet%2Fruntime.git

address feedback


Commit migrated from https://github.com/dotnet/corefx/commit/f2417f59441b0dc55ad73deb75ff23672041aa5e
---

diff --git a/src/libraries/System.Data.SqlClient/src/System/Data/SqlClient/SqlParameter.cs b/src/libraries/System.Data.SqlClient/src/System/Data/SqlClient/SqlParameter.cs
index f16ee44f4b9..d1c66dcd77b 100644
--- a/src/libraries/System.Data.SqlClient/src/System/Data/SqlClient/SqlParameter.cs
+++ b/src/libraries/System.Data.SqlClient/src/System/Data/SqlClient/SqlParameter.cs
@@ -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;
             }