Merge pull request #2068 from Unity-Technologies/forward-port-uum-82959

Move encodings usage within the lock to make access thread safe.

Author: UnityAlex

mcs/class/referencesource/mscorlib/system/text/encoding.cs

@@ -438,14 +438,14 @@ public static Encoding GetEncoding(int codepage)
 
             // Our Encoding
 
-            // See if we have a hash table with our encoding in it already.
-            if (encodings != null)
-                encodings.TryGetValue (codepage, out result);
-
-            if (result == null)
+            // Don't conflict with ourselves
+            lock (InternalSyncObject)
             {
-                // Don't conflict with ourselves
-                lock (InternalSyncObject)
+                // See if we have a hash table with our encoding in it already.
+                if (encodings != null)
+                    encodings.TryGetValue (codepage, out result);
+
+                if (result == null)
                 {
                     // Need a new hash table
                     // in case another thread beat us to creating the Dictionary