2005-11-30 Sebastien Pouliot <sebastien@ximian.com>

	* SimpleCollator.cs: Fix CAS support. The static ctor/var try to get
	the environment variable MUCH too soon (i.e. the security manager
	needs the collator).

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

diff --git a/mcs/class/corlib/Mono.Globalization.Unicode/ChangeLog b/mcs/class/corlib/Mono.Globalization.Unicode/ChangeLog
index 43fbaae09ddde7bad1822e6cd91e50bba38b1722..ede71ae1a2d1da53cf9439cfb5a333c34b458338 100644 (file)
--- a/mcs/class/corlib/Mono.Globalization.Unicode/ChangeLog
+++ b/mcs/class/corlib/Mono.Globalization.Unicode/ChangeLog
@@ -1,3 +1,9 @@
+2005-11-30  Sebastien Pouliot  <sebastien@ximian.com>
+
+       * SimpleCollator.cs: Fix CAS support. The static ctor/var try to get 
+       the environment variable MUCH too soon (i.e. the security manager 
+       needs the collator).
+
 2005-11-29  Atsushi Enomoto  <atsushi@ximian.com>
 
        * SimpleCollator.cs : direct fast-path optimization for IndexOf().

diff --git a/mcs/class/corlib/Mono.Globalization.Unicode/SimpleCollator.cs b/mcs/class/corlib/Mono.Globalization.Unicode/SimpleCollator.cs
index aef2b2ea6fb4109eb4df06ec5ab358282bf7ef51..a907ca9b24314a18dc42b53d744699afe40f7a19 100644 (file)
--- a/mcs/class/corlib/Mono.Globalization.Unicode/SimpleCollator.cs
+++ b/mcs/class/corlib/Mono.Globalization.Unicode/SimpleCollator.cs
@@ -79,7 +79,7 @@ namespace Mono.Globalization.Unicode
        {
                // this environment variable is for debugging quick check.
                static bool QuickCheckDisabled =
-                       Environment.GetEnvironmentVariable (
+                       Environment.internalGetEnvironmentVariable (
                        "MONO_COLLATION_QUICK_CHECK_DISABLED") == "yes";
 
                unsafe internal struct Context