[jboss-cvs] jboss-seam/src/main/org/jboss/seam/faces ...

[Peter Muir]

  User: pmuir   
  Date: 07/11/16 06:09:14

  Modified:    src/main/org/jboss/seam/faces  FacesManager.java
  Log:
  JBSEAM-2153
  
  Revision  Changes    Path
  1.7       +6 -1      jboss-seam/src/main/org/jboss/seam/faces/FacesManager.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: FacesManager.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/faces/FacesManager.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -b -r1.6 -r1.7
  --- FacesManager.java	21 Jun 2007 05:27:28 -0000	1.6
  +++ FacesManager.java	16 Nov 2007 11:09:14 -0000	1.7
  @@ -23,6 +23,7 @@
   import org.jboss.seam.annotations.Name;
   import org.jboss.seam.annotations.Scope;
   import org.jboss.seam.annotations.intercept.BypassInterceptors;
  +import org.jboss.seam.contexts.Contexts;
   import org.jboss.seam.contexts.FacesLifecycle;
   import org.jboss.seam.core.Conversation;
   import org.jboss.seam.core.Init;
  @@ -48,6 +49,8 @@
   {
      private static final LogProvider log = Logging.getLogProvider(FacesManager.class);
   
  +   
  +
      private boolean controllingRedirect; 
      
      /**
  @@ -194,6 +197,7 @@
         controllingRedirect = true;
         try
         {         
  +         Contexts.getEventContext().set(REDIRECT_FROM_MANAGER, "");
            externalContext.redirect( externalContext.encodeActionURL(url) );
         }
         catch (IOException ioe)
  @@ -202,6 +206,7 @@
         }
         finally
         {
  +         Contexts.getEventContext().remove(REDIRECT_FROM_MANAGER);
            controllingRedirect = false;
         }
         context.responseComplete();