[Magicajax-cvs] magicajax/Core MagicAjaxModule.cs,1.31,1.32

[Dion O. <dol...@us...>]

Update of /cvsroot/magicajax/magicajax/Core
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29043/magicajax/Core

Modified Files:
	MagicAjaxModule.cs 
Log Message:
Added _threadAbortExceptionThrown member variable.

Index: MagicAjaxModule.cs
===================================================================
RCS file: /cvsroot/magicajax/magicajax/Core/MagicAjaxModule.cs,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** MagicAjaxModule.cs	24 Nov 2005 13:13:04 -0000	1.31
--- MagicAjaxModule.cs	24 Nov 2005 14:03:31 -0000	1.32
***************
*** 54,58 ****
  	public class MagicAjaxModule: IHttpModule
  	{
! 		private bool _exceptionThrown;
  		private PageFilter _filter;
  		private HttpRequest _request;
--- 54,58 ----
  	public class MagicAjaxModule: IHttpModule
  	{
! 		private bool _threadAbortExceptionThrown;
  		private PageFilter _filter;
  		private HttpRequest _request;
***************
*** 393,397 ****
  
  			// Init private fields
! 			_exceptionThrown = false;
  			_request = context.Request;
  			_response = context.Response;
--- 393,397 ----
  
  			// Init private fields
! 			_threadAbortExceptionThrown = false;
  			_request = context.Request;
  			_response = context.Response;
***************
*** 479,490 ****
  					try
  					{
! 						_exceptionThrown = true;
! 						HttpContext.Current.Handler.ProcessRequest (HttpContext.Current);
  					}
  					catch (System.Threading.ThreadAbortException)
  					{
! 						// ThreadAbortException is for Server.Transfer, Response.Redirect
! 						// and AjaxCallHelper.End
! 						_exceptionThrown = false;
  						throw;
  					}
--- 479,488 ----
  					try
  					{
! 						HttpContext.Current.Handler.ProcessRequest(HttpContext.Current);
  					}
  					catch (System.Threading.ThreadAbortException)
  					{
! 						// ThreadAbortException is for Server.Transfer, Response.Redirect and AjaxCallHelper.End
! 						_threadAbortExceptionThrown = true;
  						throw;
  					}
***************
*** 588,599 ****
  					try
  					{
- 						_exceptionThrown = true;
  						ProcessAjaxCall(_magicAjaxContext.StoredPageInfo.Page);
  					}
  					catch (System.Threading.ThreadAbortException)
  					{
! 						// ThreadAbortException is for Server.Transfer, Response.Redirect
! 						// and AjaxCallHelper.End
! 						_exceptionThrown = false;
  						throw;
  					}
--- 586,595 ----
  					try
  					{
  						ProcessAjaxCall(_magicAjaxContext.StoredPageInfo.Page);
  					}
  					catch (System.Threading.ThreadAbortException)
  					{
! 						// ThreadAbortException is for Server.Transfer, Response.Redirect and AjaxCallHelper.End
! 						_threadAbortExceptionThrown = true;
  						throw;
  					}
***************
*** 618,622 ****
  			try
  			{
! 				if (_magicAjaxContext.IsAjaxCall && !_magicAjaxContext.CompletedAjaxCall && !_exceptionThrown)
  				{
  					// There was a Response.Redirect or Server.Transfer during AjaxCall
--- 614,618 ----
  			try
  			{
! 				if (_magicAjaxContext.IsAjaxCall && !_magicAjaxContext.CompletedAjaxCall && _threadAbortExceptionThrown)
  				{
  					// There was a Response.Redirect or Server.Transfer during AjaxCall