2010-04-21 Marek Habersack <mhabersack@novell.com>

[mono.git] / mcs / class / System.Web / System.Web / HttpContext.cs

diff --git a/mcs/class/System.Web/System.Web/HttpContext.cs b/mcs/class/System.Web/System.Web/HttpContext.cs
index 97f4890440a5d9d8586338fbe823c5329a10f530..d183afa0f4d31b816f5d2605417568a5e7fa9617 100644 (file)
--- a/mcs/class/System.Web/System.Web/HttpContext.cs
+++ b/mcs/class/System.Web/System.Web/HttpContext.cs
@@ -110,14 +110,18 @@ namespace System.Web
                        WorkerRequest = wr;
                        request = new HttpRequest (WorkerRequest, this);
                        response = new HttpResponse (WorkerRequest, this);
+#if NET_4_0
                        SessionStateBehavior = SessionStateBehavior.Default;
+#endif
                }
 
                public HttpContext (HttpRequest request, HttpResponse response)
                {
                        this.request = request;
                        this.response = response;
+#if NET_4_0
                        SessionStateBehavior = SessionStateBehavior.Default;
+#endif
                }
 
                internal bool IsProcessingInclude {
@@ -224,7 +228,7 @@ namespace System.Web
                }
 #if !TARGET_JVM
                public bool IsDebuggingEnabled {
-                       get { return HttpRuntime.IsDebuggingEnabled; }
+                       get { return RuntimeHelpers.DebuggingEnabled; }
                }
 #endif
                public IDictionary Items {
@@ -471,19 +475,15 @@ namespace System.Web
                        // we should expire the entries (or just store them in InternalCache?)
                        IResourceProvider rp = null;
                        if (!resource_providers.TryGetValue (virtualPath, out rp)) {
-                               if (isLocal) {
-                                       HttpContext ctx = HttpContext.Current;
-                                       HttpRequest req = ctx != null ? ctx.Request : null;
+                               if (isLocal)
                                        rp = provider_factory.CreateLocalResourceProvider (virtualPath);
-                               } else
+                               else
                                        rp = provider_factory.CreateGlobalResourceProvider (virtualPath);
                                
                                if (rp == null) {
-                                       if (isLocal) {
-                                               HttpContext ctx = HttpContext.Current;
-                                               HttpRequest req = ctx != null ? ctx.Request : null;
+                                       if (isLocal)
                                                rp = DefaultProviderFactory.CreateLocalResourceProvider (virtualPath);
-                                       } else
+                                       else
                                                rp = DefaultProviderFactory.CreateGlobalResourceProvider (virtualPath);
 
                                        if (rp == null)
@@ -625,8 +625,6 @@ namespace System.Web
                        if (pathRelative || pathAbsolute) {
                                if (pathRelative)
                                        filePath = VirtualPathUtility.ToAbsolute (filePath);
-                               else
-                                       filePath = filePath;
                        } else
                                filePath = VirtualPathUtility.AppendTrailingSlash (req.BaseVirtualDir) + filePath;