From b4cf914e5ac3cf3aa1305f29f3b2bfc8ab4feb8a Mon Sep 17 00:00:00 2001
From: Eyal Alalouf <eyala@mainsoft.com>
Date: Thu, 1 Sep 2005 11:54:56 +0000
Subject: [PATCH] TARGET_J2EE/JVM fixes

svn path=/trunk/mcs/; revision=49261
---
 .../System.Web.Caching/CacheDependency.cs          | 11 ++++++++++-
 mcs/class/System.Web/System.Web.Caching/ChangeLog  |  3 +++
 .../System.Web/System.Web.SessionState/ChangeLog   |  5 +++++
 .../System.Web.SessionState/SessionStateModule.cs  | 14 +++++++++-----
 4 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/mcs/class/System.Web/System.Web.Caching/CacheDependency.cs b/mcs/class/System.Web/System.Web.Caching/CacheDependency.cs
index 3767e5ccadf..2cb3c5105ab 100644
--- a/mcs/class/System.Web/System.Web.Caching/CacheDependency.cs
+++ b/mcs/class/System.Web/System.Web.Caching/CacheDependency.cs
@@ -38,7 +38,9 @@ namespace System.Web.Caching
 		CacheDependency dependency;
 		DateTime start;
 		Cache cache;
+#if !TARGET_JVM
 		FileSystemWatcher[] watchers;
+#endif
 		bool hasChanged;
 		object locker = new object ();
 		
@@ -73,6 +75,7 @@ namespace System.Web.Caching
 		
 		public CacheDependency (string[] filenames, string[] cachekeys, CacheDependency dependency, DateTime start)
 		{
+#if !TARGET_JVM
 			if (filenames != null) {
 				watchers = new FileSystemWatcher [filenames.Length];
 				for (int n=0; n<filenames.Length; n++) {
@@ -95,6 +98,7 @@ namespace System.Web.Caching
 					watchers [n] = watcher;
 				}
 			}
+#endif
 			this.cachekeys = cachekeys;
 			this.dependency = dependency;
 			if (dependency != null)
@@ -113,6 +117,11 @@ namespace System.Web.Caching
 				cache.CheckExpiration ();
 		}
 		
+#if TARGET_JVM
+		void DisposeWatchers ()
+		{
+		}
+#else
 		void DisposeWatchers ()
 		{
 			lock (locker) {
@@ -124,7 +133,7 @@ namespace System.Web.Caching
 				watchers = null;
 			}
 		}
-		
+#endif
 		public void Dispose ()
 		{
 			DisposeWatchers ();
diff --git a/mcs/class/System.Web/System.Web.Caching/ChangeLog b/mcs/class/System.Web/System.Web.Caching/ChangeLog
index 4b64566e089..592686c1db7 100644
--- a/mcs/class/System.Web/System.Web.Caching/ChangeLog
+++ b/mcs/class/System.Web/System.Web.Caching/ChangeLog
@@ -1,3 +1,6 @@
+2005-09-01 Eyal Alaluf <eyala@mainsoft.com>
+	* CacheDependency.cs: TARGET_J2EE fixes.
+
 2005-08-20 Gonzalo Paniagua Javier <gonzalo@ximian.com>
 
 	* CacheDependency.cs: add missing ctor.
diff --git a/mcs/class/System.Web/System.Web.SessionState/ChangeLog b/mcs/class/System.Web/System.Web.SessionState/ChangeLog
index 4aa20f4e485..4ed966148c8 100644
--- a/mcs/class/System.Web/System.Web.SessionState/ChangeLog
+++ b/mcs/class/System.Web/System.Web.SessionState/ChangeLog
@@ -1,3 +1,8 @@
+2005-09-01 Eyal Alaluf <eyala@mainsoft.com>
+	* SessionStateModule.cs: Under TARGET_J2EE we let the J2EE app server handle
+	  session persistence, so we don't support SQL/Remoting session servers
+	  at the ASP.Net level.
+
 2005-08-30 Gonzalo Paniagua Javier <gonzalo@ximian.com>
 
 	* SessionStateModule.cs: added lock around 'config'.
diff --git a/mcs/class/System.Web/System.Web.SessionState/SessionStateModule.cs b/mcs/class/System.Web/System.Web.SessionState/SessionStateModule.cs
index add3eae73c4..d1bd169e1f3 100644
--- a/mcs/class/System.Web/System.Web.SessionState/SessionStateModule.cs
+++ b/mcs/class/System.Web/System.Web.SessionState/SessionStateModule.cs
@@ -43,10 +43,7 @@ namespace System.Web.SessionState
 		internal static readonly string HeaderName = "AspFilterSessionId";
 		static object locker = new object ();
 		
-#if !TARGET_J2EE		
-		static SessionConfig config;
-		static Type handlerType;
-#else
+#if TARGET_J2EE		
 		static private SessionConfig config {
 			get {
 				return (SessionConfig)AppDomain.CurrentDomain.GetData("SessionStateModule.config");
@@ -63,6 +60,9 @@ namespace System.Web.SessionState
 				AppDomain.CurrentDomain.SetData("SessionStateModule.handlerType", value);
 			}
 		}
+#else
+		static SessionConfig config;
+		static Type handlerType;
 #endif		
 		ISessionHandler handler;
 		bool sessionForStaticFiles;
@@ -93,12 +93,16 @@ namespace System.Web.SessionState
 				if (config ==  null)
 					config = new SessionConfig (null);
 
+#if TARGET_J2EE
+				if (config.Mode == SessionStateMode.SQLServer || config.Mode == SessionStateMode.StateServer)
+					throw new NotImplementedException("You must use web.xml to specify session state handling");
+#else
 				if (config.Mode == SessionStateMode.StateServer)
 					handlerType = typeof (SessionStateServerHandler);
 
 				if (config.Mode == SessionStateMode.SQLServer)
 					handlerType = typeof (SessionSQLServerHandler);
-				
+#endif
 				if (config.Mode == SessionStateMode.InProc)
 					handlerType = typeof (SessionInProcHandler);
 
-- 
2.25.1