Author: miguel
Date: 2005-05-12 17:20:56 -0400 (Thu, 12 May 2005)
New Revision: 44470

Modified:
   trunk/mcs/class/corlib/System.Globalization/ChangeLog
   trunk/mcs/class/corlib/System.Globalization/CultureInfo.cs
Log:
2005-05-06  Miguel de Icaza  <[EMAIL PROTECTED]>

        * CultureInfo.cs: Eliminate double-check lock always init the 
invariant_culture_info.

Modified: trunk/mcs/class/corlib/System.Globalization/ChangeLog
===================================================================
--- trunk/mcs/class/corlib/System.Globalization/ChangeLog       2005-05-12 
21:14:35 UTC (rev 44469)
+++ trunk/mcs/class/corlib/System.Globalization/ChangeLog       2005-05-12 
21:20:56 UTC (rev 44470)
@@ -1,3 +1,7 @@
+2005-05-06  Miguel de Icaza  <[EMAIL PROTECTED]>
+
+       * CultureInfo.cs: Eliminate double-check lock always init the 
invariant_culture_info.
+
 2005-05-06 Gonzalo Paniagua Javier <[EMAIL PROTECTED]>
 
        * CultureInfo.cs: made a few variables 'volatile'. GetCultures now

Modified: trunk/mcs/class/corlib/System.Globalization/CultureInfo.cs
===================================================================
--- trunk/mcs/class/corlib/System.Globalization/CultureInfo.cs  2005-05-12 
21:14:35 UTC (rev 44469)
+++ trunk/mcs/class/corlib/System.Globalization/CultureInfo.cs  2005-05-12 
21:20:56 UTC (rev 44470)
@@ -94,19 +94,16 @@
                
                static public CultureInfo InvariantCulture {
                        get {
-                               if (invariant_culture_info == null) {
-                                       lock (typeof (CultureInfo)) {
-                                               if (invariant_culture_info == 
null) {
-                                                       invariant_culture_info 
= new CultureInfo (0x7f, false);
-                                                       
invariant_culture_info.m_isReadOnly = true;
-                                               }
-                                       }
-                               }
-                               
-                               return(invariant_culture_info);
+                               return invariant_culture_info;
                        }
                }
 
+               static CultureInfo ()
+               {
+                       invariant_culture_info = new CultureInfo (0x7f, false);
+                       invariant_culture_info.m_isReadOnly = true;
+               }
+               
                public static CultureInfo CreateSpecificCulture (string name)
                {
                        if (name == null) {

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to