Update of /cvsroot/magicajax/magicajax/Core
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6859/Core
Modified Files:
MagicAjaxModule.cs
Log Message:
Session/Cache storing modes will throw exception when used for NET 2.0
Index: MagicAjaxModule.cs
===================================================================
RCS file: /cvsroot/magicajax/magicajax/Core/MagicAjaxModule.cs,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** MagicAjaxModule.cs 18 Nov 2005 16:01:30 -0000 1.13
--- MagicAjaxModule.cs 18 Nov 2005 16:04:15 -0000 1.14
***************
*** 187,191 ****
{
// Store the page object
!
if ( ! page.Request.Browser.Crawler && page.Request.Browser.JavaScript)
{
--- 187,193 ----
{
// Store the page object
! #if NET_2_0
! throw new MagicAjaxException("Session/Cache page storing modes are not supported for .NET 2.0 framework.");
! #endif
if ( ! page.Request.Browser.Crawler && page.Request.Browser.JavaScript)
{
***************
*** 573,580 ****
Util.SetPrivateField (_currentPageInfo.Page, typeof(Page), "_inOnFormRender", true);
- #if NET_2_0
- Util.CallPrivateMethod (_currentPageInfo.Page, typeof(Page), "OnInit", EventArgs.Empty);
- #endif
-
if ( _currentPageInfo.Page.Validators.Count == 0 )
{
--- 575,578 ----
***************
*** 596,605 ****
ProcessAjaxCall(_currentPageInfo.Page);
}
! catch (System.Threading.ThreadAbortException exc)
{
// ThreadAbortException is for Server.Transfer, Response.Redirect
// and AjaxCallHelper.End
_exceptionThrown = false;
! throw exc;
}
--- 594,603 ----
ProcessAjaxCall(_currentPageInfo.Page);
}
! catch (System.Threading.ThreadAbortException)
{
// ThreadAbortException is for Server.Transfer, Response.Redirect
// and AjaxCallHelper.End
_exceptionThrown = false;
! throw;
}
|
