Author: kostat
Date: 2008-01-21 11:17:51 -0500 (Mon, 21 Jan 2008)
New Revision: 93406
Modified:
trunk/mcs/class/System.Web/System.Web.Profile/ProfileModule.cs
trunk/mcs/class/System.Web/System.Web/HttpApplication.cs
Log:
undo r93350 and implement in Mainsoft.Web.Portal using phaseListener
Modified: trunk/mcs/class/System.Web/System.Web/HttpApplication.cs
===================================================================
--- trunk/mcs/class/System.Web/System.Web/HttpApplication.cs 2008-01-21
16:17:19 UTC (rev 93405)
+++ trunk/mcs/class/System.Web/System.Web/HttpApplication.cs 2008-01-21
16:17:51 UTC (rev 93406)
@@ -1018,12 +1018,6 @@
}
#if TARGET_J2EE
if (doProcessHandler) {
- foreach (IHttpModule module in Modules) {
- if (module is
System.Web.Profile.ProfileModule) {
-
((System.Web.Profile.ProfileModule) module).OnLeave (this, EventArgs.Empty);
- break;
- }
- }
yield return false;
goto processHandler;
}
Modified: trunk/mcs/class/System.Web/System.Web.Profile/ProfileModule.cs
===================================================================
--- trunk/mcs/class/System.Web/System.Web.Profile/ProfileModule.cs
2008-01-21 16:17:19 UTC (rev 93405)
+++ trunk/mcs/class/System.Web/System.Web.Profile/ProfileModule.cs
2008-01-21 16:17:51 UTC (rev 93406)
@@ -40,10 +40,6 @@
ProfileBase profile;
string anonymousCookieName = null;
-#if TARGET_J2EE
- bool _OnLeaveCalled;
-#endif
-
public ProfileModule ()
{
}
@@ -74,10 +70,6 @@
if (!ProfileManager.Enabled)
return;
-#if TARGET_J2EE
- _OnLeaveCalled = false;
-#endif
-
if (HttpContext.Current.Request.IsAuthenticated) {
HttpCookie cookie = app.Request.Cookies
[anonymousCookieName];
if (cookie != null && (cookie.Expires !=
DateTime.MinValue && cookie.Expires > DateTime.Now)) {
@@ -95,9 +87,7 @@
}
}
}
-#if TARGET_J2EE
- internal
-#endif
+
void OnLeave (object o, EventArgs eventArgs)
{
if (!ProfileManager.Enabled)
@@ -105,13 +95,6 @@
if (!app.Context.ProfileInitialized)
return;
-
-#if TARGET_J2EE
- if (_OnLeaveCalled)
- return;
-
- _OnLeaveCalled = true;
-#endif
if (ProfileManager.AutomaticSaveEnabled) {
profile = app.Context.Profile;
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
