Author: krasnov
Date: 2007-03-29 07:43:42 -0500 (Thu, 29 Mar 2007)
New Revision: 75134
Modified:
trunk/mcs/class/System.Web/System.Web/ChangeLog
trunk/mcs/class/System.Web/System.Web/HttpContext.cs
trunk/mcs/class/System.Web/System.Web/HttpContext.jvm.cs
Log:
* HttpContext.cs: timeout methods removed from TARGET_J2EE compilation
* HttpContext.jvm.cs: added stubs for timeout methods
Modified: trunk/mcs/class/System.Web/System.Web/ChangeLog
===================================================================
--- trunk/mcs/class/System.Web/System.Web/ChangeLog 2007-03-29 12:39:39 UTC
(rev 75133)
+++ trunk/mcs/class/System.Web/System.Web/ChangeLog 2007-03-29 12:43:42 UTC
(rev 75134)
@@ -1,3 +1,8 @@
+2007-03-29 Vladimir Krasnov <[EMAIL PROTECTED]>
+
+ * HttpContext.cs: timeout methods removed from TARGET_J2EE compilation
+ * HttpContext.jvm.cs: added stubs for timeout methods
+
2007-03-28 Igor Zelmanovich <[EMAIL PROTECTED]>
* StaticSiteMapProvider.cs:
Modified: trunk/mcs/class/System.Web/System.Web/HttpContext.cs
===================================================================
--- trunk/mcs/class/System.Web/System.Web/HttpContext.cs 2007-03-29
12:39:39 UTC (rev 75133)
+++ trunk/mcs/class/System.Web/System.Web/HttpContext.cs 2007-03-29
12:43:42 UTC (rev 75134)
@@ -579,6 +579,7 @@
}
}
+#if !TARGET_J2EE
internal bool CheckIfTimeout (DateTime t)
{
if (Interlocked.CompareExchange (ref timeout_possible,
0, 0) == 0)
@@ -601,6 +602,7 @@
{
Interlocked.CompareExchange (ref timeout_possible, 0,
1);
}
+#endif
#endregion
#if NET_2_0
Modified: trunk/mcs/class/System.Web/System.Web/HttpContext.jvm.cs
===================================================================
--- trunk/mcs/class/System.Web/System.Web/HttpContext.jvm.cs 2007-03-29
12:39:39 UTC (rev 75133)
+++ trunk/mcs/class/System.Web/System.Web/HttpContext.jvm.cs 2007-03-29
12:43:42 UTC (rev 75134)
@@ -74,5 +74,24 @@
return _httpRuntime;
}
}
+
+ // Timeout is not supported in GH
+ internal bool CheckIfTimeout (DateTime t)
+ {
+ return false;
+ }
+
+ internal bool TimeoutPossible
+ {
+ get { return false; }
+ }
+
+ internal void BeginTimeoutPossible ()
+ {
+ }
+
+ internal void EndTimeoutPossible ()
+ {
+ }
}
}
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches