2006-05-05 Sebastien Pouliot <sebastien@ximian.com>

	* ExecutionContext.cs: Don't capture the compressed stack unless the
	security manager is active (this wasn't ready to be called in
	production code).

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

diff --git a/mcs/class/corlib/System.Threading/ChangeLog b/mcs/class/corlib/System.Threading/ChangeLog
index 76f98a86a3dab5177ff42ce0fa04fdbb1d05ff2d..008a6c0c8d88946ed7a3ec0a7f28a8255b373e22 100644 (file)
--- a/mcs/class/corlib/System.Threading/ChangeLog
+++ b/mcs/class/corlib/System.Threading/ChangeLog
@@ -1,3 +1,9 @@
+2006-05-05  Sebastien Pouliot  <sebastien@ximian.com>
+
+       * ExecutionContext.cs: Don't capture the compressed stack unless the 
+       security manager is active (this wasn't ready to be called in 
+       production code).
+
 2004-04-29  Atsushi Enomoto  <atsushi@ximian.com>
 
        * Timer.cs : avoid NullReferenceException when it is already disposed.

diff --git a/mcs/class/corlib/System.Threading/ExecutionContext.cs b/mcs/class/corlib/System.Threading/ExecutionContext.cs
index d3176bfd37412df468819ac8f72e87339a50c3bf..ed5575c3ba7178d172838e06728827bf6ff44725 100644 (file)
--- a/mcs/class/corlib/System.Threading/ExecutionContext.cs
+++ b/mcs/class/corlib/System.Threading/ExecutionContext.cs
@@ -69,7 +69,8 @@ namespace System.Threading {
                                return null;
 
                        ExecutionContext capture = new ExecutionContext (ec);
-                       capture.SecurityContext = SecurityContext.Capture ();
+                       if (SecurityManager.SecurityEnabled)
+                               capture.SecurityContext = SecurityContext.Capture ();
                        return capture;
                }