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

[Gavin King]

  User: gavin   
  Date: 07/07/12 07:18:31

  Modified:    src/main/org/jboss/seam/navigation  Pages.java
  Log:
  dont redirect when you try to hit debug page
  
  Revision  Changes    Path
  1.7       +5 -2      jboss-seam/src/main/org/jboss/seam/navigation/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/navigation/Pages.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -b -r1.6 -r1.7
  --- Pages.java	26 Jun 2007 16:54:13 -0000	1.6
  +++ Pages.java	12 Jul 2007 11:18:31 -0000	1.7
  @@ -162,6 +162,7 @@
            }
         }
      }
  +   
      /**
       * Create a new Page object for a JSF view id,
       * by searching for a viewId.page.xml file.
  @@ -183,6 +184,7 @@
            return getCachedPage(viewId);
         }
      }
  +   
      private Page getCachedPage(String viewId)
      {
         Page result = pagesByViewId.get(viewId);
  @@ -1458,8 +1460,9 @@
      public static boolean isDebugPage()
      {
         return Init.instance().isDebug() &&
  -            ( FacesContext.getCurrentInstance() != null ) &&
  -            "/debug.xhtml".equals( getCurrentViewId() );
  +            FacesContext.getCurrentInstance() != null &&
  +            FacesContext.getCurrentInstance().getViewRoot() != null &&
  +            getCurrentViewId().startsWith("/debug.");
      }
      
   }