Author: eyala
Date: 2006-09-11 13:31:21 -0400 (Mon, 11 Sep 2006)
New Revision: 65246

Modified:
   branches/mainsoft/gh20preview/mcs/class/System.Web/System.Web/ChangeLog
   branches/mainsoft/gh20preview/mcs/class/System.Web/System.Web/SiteMap.cs
Log:
Explicitly use AppDomain for static variables for TARGET_JVM.

Modified: 
branches/mainsoft/gh20preview/mcs/class/System.Web/System.Web/ChangeLog
===================================================================
--- branches/mainsoft/gh20preview/mcs/class/System.Web/System.Web/ChangeLog     
2006-09-11 17:27:08 UTC (rev 65245)
+++ branches/mainsoft/gh20preview/mcs/class/System.Web/System.Web/ChangeLog     
2006-09-11 17:31:21 UTC (rev 65246)
@@ -1,3 +1,8 @@
+2006-09-11  Eyal Alaluf  <[EMAIL PROTECTED]>
+
+       * SiteMap.cs: Explicitly used AppDomain for static members.
+         Patch by Roei Erez.
+
 2006-09-10  Vladimir Krasnov  <[EMAIL PROTECTED]>
 
        * HttpWriter.cs: fixed WriteLine to work correctly in utf-16 encoding

Modified: 
branches/mainsoft/gh20preview/mcs/class/System.Web/System.Web/SiteMap.cs
===================================================================
--- branches/mainsoft/gh20preview/mcs/class/System.Web/System.Web/SiteMap.cs    
2006-09-11 17:27:08 UTC (rev 65245)
+++ branches/mainsoft/gh20preview/mcs/class/System.Web/System.Web/SiteMap.cs    
2006-09-11 17:31:21 UTC (rev 65246)
@@ -92,8 +92,22 @@
                        }
                }
 
+#if !TARGET_JVM
                static SiteMapProvider provider;
                static SiteMapProviderCollection providers;
+#else
+        static SiteMapProvider provider
+        {
+            get { return 
(SiteMapProvider)AppDomain.CurrentDomain.GetData("System.Web.SiteMap.provider");
 }
+            set { 
AppDomain.CurrentDomain.SetData("System.Web.SiteMap.provider", value);  }
+        }
+
+        static SiteMapProviderCollection providers
+        {
+            get { return 
(SiteMapProviderCollection)AppDomain.CurrentDomain.GetData("System.Web.SiteMap.providers");
 }
+            set { 
AppDomain.CurrentDomain.SetData("System.Web.SiteMap.providers", value); }
+        }
+#endif
                static object locker = new object ();
        }
 }

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to