Author: krasnov
Date: 2007-03-25 08:48:38 -0500 (Sun, 25 Mar 2007)
New Revision: 74959

Modified:
   trunk/mcs/class/System.Web/System.Web/ChangeLog
   trunk/mcs/class/System.Web/System.Web/HttpContext.cs
Log:
* HttpContext.cs: AppGlobalResourcesAssembly static member stored in AppDomain 
for TARGET_JVM

Modified: trunk/mcs/class/System.Web/System.Web/ChangeLog
===================================================================
--- trunk/mcs/class/System.Web/System.Web/ChangeLog     2007-03-25 13:14:18 UTC 
(rev 74958)
+++ trunk/mcs/class/System.Web/System.Web/ChangeLog     2007-03-25 13:48:38 UTC 
(rev 74959)
@@ -1,3 +1,8 @@
+2007-03-25  Vladimir Krasnov  <[EMAIL PROTECTED]>
+
+       * HttpContext.cs: AppGlobalResourcesAssembly static member stored in
+       AppDomain for TARGET_JVM
+
 2007-03-24  Marek Habersack  <[EMAIL PROTECTED]>
 
        * HttpRuntime.cs: use ICalls.GetMachineConfigPath instead of

Modified: trunk/mcs/class/System.Web/System.Web/HttpContext.cs
===================================================================
--- trunk/mcs/class/System.Web/System.Web/HttpContext.cs        2007-03-25 
13:14:18 UTC (rev 74958)
+++ trunk/mcs/class/System.Web/System.Web/HttpContext.cs        2007-03-25 
13:48:38 UTC (rev 74959)
@@ -73,7 +73,15 @@
                int timeout_possible;
                DateTime time_stamp = DateTime.UtcNow;
 #if NET_2_0
+#if TARGET_JVM
+               const string app_global_res_key = 
"HttpContext.app_global_res_key";
+               internal static Assembly AppGlobalResourcesAssembly {
+                       get { return (Assembly) AppDomain.CurrentDomain.GetData 
(app_global_res_key); }
+                       set { AppDomain.CurrentDomain.SetData 
(app_global_res_key, value); }
+               }
+#else
                internal static Assembly AppGlobalResourcesAssembly;
+#endif
                ProfileBase profile = null;
                LinkedList<IHttpHandler> handlers;
 #endif

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

Reply via email to