Implementation of the 2.0 session state model

[mono.git] / mcs / class / System.Web / System.Web.SessionState / SessionStateModule.cs

diff --git a/mcs/class/System.Web/System.Web.SessionState/SessionStateModule.cs b/mcs/class/System.Web/System.Web.SessionState/SessionStateModule.cs
index dfc36bd0f666e88b017181a9d4fff528e5172751..1deb4fb1adc707e1638df800ba57bab1481f4fb4 100644 (file)
--- a/mcs/class/System.Web/System.Web.SessionState/SessionStateModule.cs
+++ b/mcs/class/System.Web/System.Web.SessionState/SessionStateModule.cs
@@ -3,11 +3,11 @@
 //
 // Authors:
 //     Gonzalo Paniagua Javier (gonzalo@ximian.com)
-//     Stefan Görling (stefan@gorling.se)
+//     Stefan Görling (stefan@gorling.se)
 //     Jackson Harper (jackson@ximian.com)
 //
 // Copyright (C) 2002-2006 Novell, Inc (http://www.novell.com)
-// (C) 2003 Stefan Görling (http://www.gorling.se)
+// (C) 2003 Stefan Görling (http://www.gorling.se)
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the
@@ -29,7 +29,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-
+#if !NET_2_0
 using System.Web.Configuration;
 using System.Web.Caching;
 using System.Web.Util;
@@ -47,7 +47,7 @@ namespace System.Web.SessionState
                static object locker = new object ();
                
 #if TARGET_J2EE                
-               static private SessionConfig config {
+static private SessionConfig config {
                        get {
                                return (SessionConfig)AppDomain.CurrentDomain.GetData("SessionStateModule.config");
                        }
@@ -63,12 +63,8 @@ namespace System.Web.SessionState
                                AppDomain.CurrentDomain.SetData("SessionStateModule.handlerType", value);
                        }
                }
-#else
-#if NET_2_0
-               static SessionStateSection config;
 #else
                static SessionConfig config;
-#endif
                static Type handlerType;
 #endif         
                ISessionHandler handler;
@@ -91,23 +87,15 @@ namespace System.Web.SessionState
                        handler.Dispose();
                }
 
-#if NET_2_0
-               SessionStateSection GetConfig ()
-#else
                SessionConfig GetConfig ()
-#endif
                {
                        lock (locker) {
                                if (config != null)
                                        return config;
 
-#if NET_2_0
-                               config = (SessionStateSection) WebConfigurationManager.GetSection ("system.web/sessionState");
-#else
                                config = (SessionConfig) HttpContext.GetAppConfig ("system.web/sessionState");
                                if (config ==  null)
                                        config = new SessionConfig (null);
-#endif
 
 #if TARGET_J2EE
                                if (config.Mode == SessionStateMode.SQLServer || config.Mode == SessionStateMode.StateServer)
@@ -130,11 +118,7 @@ namespace System.Web.SessionState
                public void Init (HttpApplication app)
                {
                        sessionForStaticFiles = (Environment.GetEnvironmentVariable ("MONO_XSP_STATIC_SESSION") != null);
-#if NET_2_0
-                       SessionStateSection cfg = GetConfig ();
-#else
                        SessionConfig cfg = GetConfig ();
-#endif
                        if (handlerType == null)
                                return;
 
@@ -239,11 +223,7 @@ namespace System.Web.SessionState
 
                internal void OnSessionRemoved (string key, object value, CacheItemRemovedReason reason)
                {
-#if NET_2_0
-                       SessionStateSection cfg = GetConfig ();
-#else
                        SessionConfig cfg = GetConfig ();
-#endif
 
                        // Only invoked for InProc (see msdn2 docs on SessionStateModule.End)
                        if (cfg.Mode == SessionStateMode.InProc)
@@ -257,3 +237,4 @@ namespace System.Web.SessionState
        }
 }
 
+#endif