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

[Gavin King]

  User: gavin   
  Date: 07/06/14 23:50:16

  Modified:    src/main/org/jboss/seam/core   Manager.java Pages.java
  Log:
  exclude debug page
  
  Revision  Changes    Path
  1.171     +2 -7      jboss-seam/src/main/org/jboss/seam/core/Manager.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Manager.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Manager.java,v
  retrieving revision 1.170
  retrieving revision 1.171
  diff -u -b -r1.170 -r1.171
  --- Manager.java	13 Jun 2007 16:43:02 -0000	1.170
  +++ Manager.java	15 Jun 2007 03:50:16 -0000	1.171
  @@ -42,7 +42,7 @@
    *
    * @author Gavin King
    * @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
  - * @version $Revision: 1.170 $
  + * @version $Revision: 1.171 $
    */
   @Scope(ScopeType.EVENT)
   @Name("org.jboss.seam.core.manager")
  @@ -496,12 +496,7 @@
            setCurrentConversationId( ce.getId() );
            setCurrentConversationIdStack( ce.getConversationIdStack() );
   
  -         boolean removeAfterRedirect = ce.isRemoveAfterRedirect() && !(
  -               Init.instance().isDebug() &&
  -               (FacesContext.getCurrentInstance() != null) &&
  -               "/debug.xhtml".equals( Pages.getCurrentViewId() )
  -            );
  -         
  +         boolean removeAfterRedirect = ce.isRemoveAfterRedirect() && !Pages.isDebugPage();
            if (removeAfterRedirect)
            {
               setLongRunningConversation(false);
  
  
  
  1.130     +7 -0      jboss-seam/src/main/org/jboss/seam/core/Pages.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Pages.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Pages.java,v
  retrieving revision 1.129
  retrieving revision 1.130
  diff -u -b -r1.129 -r1.130
  --- Pages.java	12 Jun 2007 07:09:15 -0000	1.129
  +++ Pages.java	15 Jun 2007 03:50:16 -0000	1.130
  @@ -1463,4 +1463,11 @@
         this.resources = resources;
      }
      
  +   public static boolean isDebugPage()
  +   {
  +      return Init.instance().isDebug() &&
  +            ( FacesContext.getCurrentInstance() != null ) &&
  +            "/debug.xhtml".equals( getCurrentViewId() );
  +   }
  +   
   }