Merge pull request #1506 from akoeplinger/fix-paste-test

[mono.git] / mcs / class / I18N / CJK / JISConvert.cs

diff --git a/mcs/class/I18N/CJK/JISConvert.cs b/mcs/class/I18N/CJK/JISConvert.cs
index 17191f8a15e8e58a0820c3bb00e3153873508f72..826ba536ef635b91ef33fccf189ef569a7149beb 100644 (file)
--- a/mcs/class/I18N/CJK/JISConvert.cs
+++ b/mcs/class/I18N/CJK/JISConvert.cs
@@ -71,13 +71,13 @@ internal unsafe sealed class JISConvert
 
        // The one and only JIS conversion object in the system.
        private static JISConvert convert;
-
+       static readonly object lockobj = new object ();
        // Get the primary JIS conversion object.
        public static JISConvert Convert
                        {
                                get
                                {
-                                       lock(typeof(JISConvert))
+                                       lock(lockobj)
                                        {
                                                if(convert != null)
                                                {