2005-05-06 Miguel de Icaza <miguel@novell.com>

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

svn path=/trunk/mcs/; revision=44470

diff --git a/mcs/class/corlib/System.Globalization/ChangeLog b/mcs/class/corlib/System.Globalization/ChangeLog
index a0dd0187df2460742accc59853bb51d52172d18d..8c5e417c40f1ed3a5524ea9b4638f8e8648d3463 100644 (file)
--- a/mcs/class/corlib/System.Globalization/ChangeLog
+++ b/mcs/class/corlib/System.Globalization/ChangeLog
@@ -1,3 +1,7 @@
+2005-05-06  Miguel de Icaza  <miguel@novell.com>
+
+       * CultureInfo.cs: Eliminate double-check lock always init the invariant_culture_info.
+
 2005-05-06 Gonzalo Paniagua Javier <gonzalo@ximian.com>
 
        * CultureInfo.cs: made a few variables 'volatile'. GetCultures now

diff --git a/mcs/class/corlib/System.Globalization/CultureInfo.cs b/mcs/class/corlib/System.Globalization/CultureInfo.cs
index df6996dfe451bdb5c2cad6f3de7d701dce3ef1ba..c7f9d17c45792bff2f9ec7fcfa8093e30586e5d8 100644 (file)
--- a/mcs/class/corlib/System.Globalization/CultureInfo.cs
+++ b/mcs/class/corlib/System.Globalization/CultureInfo.cs
@@ -94,19 +94,16 @@ namespace System.Globalization
                
                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) {