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

[Gavin King]

  User: gavin   
  Date: 07/02/21 23:56:16

  Modified:    src/main/org/jboss/seam/web  RedirectFilter.java
  Log:
  make redirect filter work w/o facescontext
  
  Revision  Changes    Path
  1.4       +13 -5     jboss-seam/src/main/org/jboss/seam/web/RedirectFilter.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: RedirectFilter.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/web/RedirectFilter.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -b -r1.3 -r1.4
  --- RedirectFilter.java	10 Feb 2007 16:31:25 -0000	1.3
  +++ RedirectFilter.java	22 Feb 2007 04:56:16 -0000	1.4
  @@ -65,12 +65,20 @@
      
      public static String getViewId(String url)
      {
  -      ExternalContext externalContext = FacesContext.getCurrentInstance().getExternalContext();
  +      FacesContext facesContext = FacesContext.getCurrentInstance();
  +      if (facesContext==null)
  +      {
  +         return null;
  +      }
  +      else
  +      {
  +         ExternalContext externalContext = facesContext.getExternalContext();
         String pathInfo = externalContext.getRequestPathInfo();
         String servletPath = externalContext.getRequestServletPath();
         String contextPath = externalContext.getRequestContextPath();
         return getViewId(url, pathInfo, servletPath, contextPath);
      }
  +   }
      
      protected static String getViewId(String url, String pathInfo, String servletPath, String contextPath)
      {