2004-08-27 Gonzalo Paniagua Javier <gonzalo@ximian.com>

	* HttpRuntime.cs: removed initializations to null in .cctor. Prevent
	other requests from avoiding the lock if they are received before the
	configuration system is inited. Ensure that the queue manager is not
	null before using it (it can be null while the first request is being
	processed).

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

2 files changed, 12 insertions, 9 deletions

diff --git a/mcs/class/System.Web/System.Web/ChangeLog b/mcs/class/System.Web/System.Web/ChangeLog
index c7b5b3463cd..90f1584d3f7 100644
--- a/mcs/class/System.Web/System.Web/ChangeLog
+++ b/mcs/class/System.Web/System.Web/ChangeLog
@@ -1,3 +1,11 @@
+2004-08-27 Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* HttpRuntime.cs: removed initializations to null in .cctor. Prevent
+	other requests from avoiding the lock if they are received before the
+	configuration system is inited. Ensure that the queue manager is not
+	null before using it (it can be null while the first request is being
+	processed).
+
 2004-08-22 Gonzalo Paniagua Javier <gonzalo@ximian.com>
 
 	* HttpServerUtility.cs: ensure we have a full virtual path for the
diff --git a/mcs/class/System.Web/System.Web/HttpRuntime.cs b/mcs/class/System.Web/System.Web/HttpRuntime.cs
index f48797c3815..beb7048515c 100644
--- a/mcs/class/System.Web/System.Web/HttpRuntime.cs
+++ b/mcs/class/System.Web/System.Web/HttpRuntime.cs
@@ -76,12 +76,6 @@ namespace System.Web {
 
 		static HttpRuntime ()
 		{
-			appPathDiscoveryStackWalk = null;
-			ctrlPrincipalStackWalk    = null;
-			sensitiveInfoStackWalk    = null;
-			unmgdCodeStackWalk        = null;
-			unrestrictedStackWalk     = null;
-         
 			_runtime = new HttpRuntime ();
 			_runtime.Init();
 		}
@@ -279,9 +273,9 @@ namespace System.Web {
 				if (!_firstRequestStarted) {
 					lock (this) {
 						if (!_firstRequestStarted) {
-							_firstRequestStarted = true;
 							_firstRequestStartTime = DateTime.Now;
 							OnFirstRequestStart(context);
+							_firstRequestStarted = true;
 						}						
 					}
 				}
@@ -343,7 +337,8 @@ namespace System.Web {
 			if (Request == null)
 				throw new ArgumentNullException ("Request");
 
-			if (!_runtime._firstRequestExecuted || _runtime.queueManager.CanExecuteRequest (false)) {
+			QueueManager mgr = _runtime.queueManager;
+			if (!_runtime._firstRequestExecuted || mgr == null || mgr.CanExecuteRequest (false)) {
 				_runtime.InternalExecuteRequest (Request);
 			} else {
 				_runtime.queueManager.Queue (Request);
@@ -507,7 +502,7 @@ namespace System.Web {
 
 		[MonoTODO ("GetResourceStringFromResourceManager (string)")]
 		private string GetResourceStringFromResourceManager (string key) {
-			return "String returned by HttpRuntime.GetResourceStringFromResourceManager";
+			return key;
 		}
 
 		#region Security Internal Methods (not impl)