2004-09-05 Gonzalo Paniagua Javier <gonzalo@ximian.com>

	* TraceContext.cs: when IsEnabled has not been set, return the value
	from the TraceManager. Fixes bug #63469.

svn path=/branches/mono-1-0/mcs/; revision=33557

2 files changed, 9 insertions, 2 deletions

diff --git a/mcs/class/System.Web/System.Web/ChangeLog b/mcs/class/System.Web/System.Web/ChangeLog
index d6f58a48b8a..6991c65dbe1 100644
--- a/mcs/class/System.Web/System.Web/ChangeLog
+++ b/mcs/class/System.Web/System.Web/ChangeLog
@@ -8,6 +8,11 @@
 	* HttpApplication.cs: only add/remove to/from the timeout
 	manager when we're in a interruptible step.
 
+2004-09-05 Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* TraceContext.cs: when IsEnabled has not been set, return the value
+	from the TraceManager. Fixes bug #63469.
+
 2004-08-31 Gonzalo Paniagua Javier <gonzalo@ximian.com>
 
 	* HttpRuntime.cs: initialize the response writer when finishing a
diff --git a/mcs/class/System.Web/System.Web/TraceContext.cs b/mcs/class/System.Web/System.Web/TraceContext.cs
index f939add498b..f4ad22af99d 100644
--- a/mcs/class/System.Web/System.Web/TraceContext.cs
+++ b/mcs/class/System.Web/System.Web/TraceContext.cs
@@ -42,7 +42,7 @@ namespace System.Web {
       private TraceMode _Mode;

       private TraceData data;

       private bool data_saved;

-      private bool _haveTrace = false;
+      private bool _haveTrace;
            

       public TraceContext(HttpContext Context) {

 	 _Context = Context;

@@ -58,6 +58,8 @@ namespace System.Web {
 

       public bool IsEnabled {

 	 get {

+	    if (!_haveTrace)
+	        return HttpRuntime.TraceManager.Enabled;
 	    return _Enabled;

 	 }

 

@@ -104,7 +106,7 @@ namespace System.Web {
       }

 

       private void Write(string category, string msg, Exception error, bool Warning) {

-	      if (!_Enabled)

+	      if (!IsEnabled)

 		      return;

               if (data == null)

                       data = new TraceData ();