[Springnet-commits] Spring.Net/src/Spring/Spring.Web/Web/Support PageHandlerFactory.cs, 1.33, 1.34

[Erich E. <oak...@us...>]

Update of /cvsroot/springnet/Spring.Net/src/Spring/Spring.Web/Web/Support
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv3960/src/Spring/Spring.Web/Web/Support

Modified Files:
	PageHandlerFactory.cs 
Log Message:
fixed SPRNET-838

Index: PageHandlerFactory.cs
===================================================================
RCS file: /cvsroot/springnet/Spring.Net/src/Spring/Spring.Web/Web/Support/PageHandlerFactory.cs,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** PageHandlerFactory.cs	23 Aug 2007 08:27:08 -0000	1.33
--- PageHandlerFactory.cs	27 Jan 2008 23:29:55 -0000	1.34
***************
*** 91,95 ****
              lock (handlers.SyncRoot)
              {
!                 handler = (IHttpHandler) handlers[url];
                  if (handler != null)
                  {
--- 91,95 ----
              lock (handlers.SyncRoot)
              {
!                 handler = (IHttpHandler)handlers[url];
                  if (handler != null)
                  {
***************
*** 113,117 ****
              string appPath = context.Request.ApplicationPath.TrimEnd('/');
              string appRelativeVirtualPath = url;
!             if(appRelativeVirtualPath.ToLower().StartsWith(appPath.ToLower()))
              {
                  appRelativeVirtualPath = appRelativeVirtualPath.Substring(appPath.Length);
--- 113,117 ----
              string appPath = context.Request.ApplicationPath.TrimEnd('/');
              string appRelativeVirtualPath = url;
!             if (appRelativeVirtualPath.ToLower().StartsWith(appPath.ToLower()))
              {
                  appRelativeVirtualPath = appRelativeVirtualPath.Substring(appPath.Length);
***************
*** 159,163 ****
              else
              {
!                 Type pageType = WebObjectUtils.GetPageType(url);
                  if (typeof(IRequiresSessionState).IsAssignableFrom(pageType))
                  {
--- 159,165 ----
              else
              {
!                 Type pageType = null;
!                 pageType = WebObjectUtils.GetCompiledPageType(url);
! 
                  if (typeof(IRequiresSessionState).IsAssignableFrom(pageType))
                  {
***************
*** 201,205 ****
          // since we don't use sync, make it volatile
          private volatile IHttpHandler cachedHandler;
!  
          // holds shared state for handlerType
          private Type handlerType;
--- 203,207 ----
          // since we don't use sync, make it volatile
          private volatile IHttpHandler cachedHandler;
! 
          // holds shared state for handlerType
          private Type handlerType;
***************
*** 296,308 ****
              if (processId != null)
              {
!                 handler = (IHttpHandler) ProcessManager.GetProcess(processId);
              }
  
              if (handler == null)
              {
!                 handler = (IHttpHandler) this.appContext.GetObject(this.pageId);
                  if (handler is IProcess)
                  {
!                     ((IProcess) handler).Start(url);
                  }
              }
--- 298,310 ----
              if (processId != null)
              {
!                 handler = (IHttpHandler)ProcessManager.GetProcess(processId);
              }
  
              if (handler == null)
              {
!                 handler = (IHttpHandler)this.appContext.GetObject(this.pageId);
                  if (handler is IProcess)
                  {
!                     ((IProcess)handler).Start(url);
                  }
              }
***************
*** 318,322 ****
              if (handler is Control)
              {
!                 ControlInterceptor.EnsureControlIntercepted(appContext, (Control) handler);
              }
              else
--- 320,324 ----
              if (handler is Control)
              {
!                 ControlInterceptor.EnsureControlIntercepted(appContext, (Control)handler);
              }
              else
***************
*** 324,328 ****
                  if (handler is ISupportsWebDependencyInjection)
                  {
!                     ((ISupportsWebDependencyInjection) handler).DefaultApplicationContext = appContext;
                  }
              }
--- 326,330 ----
                  if (handler is ISupportsWebDependencyInjection)
                  {
!                     ((ISupportsWebDependencyInjection)handler).DefaultApplicationContext = appContext;
                  }
              }
***************
*** 412,416 ****
          /// <param name="appContext">Application context instance to retrieve page from.</param>
          /// <param name="pageName">Name of the page object to execute.</param>
!         public SessionAwarePageHandler(IApplicationContext appContext, string pageName) : base(appContext, pageName)
          {
          }
--- 414,419 ----
          /// <param name="appContext">Application context instance to retrieve page from.</param>
          /// <param name="pageName">Name of the page object to execute.</param>
!         public SessionAwarePageHandler(IApplicationContext appContext, string pageName)
!             : base(appContext, pageName)
          {
          }