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

[Gavin King]

  User: gavin   
  Date: 06/12/03 02:01:54

  Modified:    src/main/org/jboss/seam/core  Exceptions.java
  Log:
  fix bad handling of contexts during logout
  don't redirect to the debug page when not in a JSF request
  
  Revision  Changes    Path
  1.16      +5 -4      jboss-seam/src/main/org/jboss/seam/core/Exceptions.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Exceptions.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Exceptions.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -b -r1.15 -r1.16
  --- Exceptions.java	24 Nov 2006 23:15:17 -0000	1.15
  +++ Exceptions.java	3 Dec 2006 07:01:54 -0000	1.16
  @@ -29,7 +29,6 @@
   import org.jboss.seam.contexts.Context;
   import org.jboss.seam.contexts.Contexts;
   import org.jboss.seam.contexts.Lifecycle;
  -import org.jboss.seam.interceptors.ExceptionInterceptor;
   import org.jboss.seam.util.DTDEntityResolver;
   import org.jboss.seam.util.Reflections;
   import org.jboss.seam.util.Resources;
  @@ -48,7 +47,7 @@
   @Name("org.jboss.seam.core.exceptions")
   public class Exceptions 
   {
  -   private static final Log log = LogFactory.getLog(ExceptionInterceptor.class);
  +   private static final Log log = LogFactory.getLog(Exceptions.class);
      
      private List<ExceptionHandler> exceptionHandlers = new ArrayList<ExceptionHandler>();
      
  @@ -244,7 +243,8 @@
         public boolean isHandler(Exception e)
         {
            return e.getClass().isAnnotationPresent(Redirect.class) && 
  -               Lifecycle.getPhaseId()!=PhaseId.RENDER_RESPONSE;
  +               Lifecycle.getPhaseId()!=PhaseId.RENDER_RESPONSE && 
  +               Lifecycle.getPhaseId()!=null;
         }
         
         protected String getMessage(Exception e)
  @@ -383,7 +383,8 @@
   
         public boolean isHandler(Exception e)
         {
  -         return Lifecycle.getPhaseId()!=PhaseId.RENDER_RESPONSE;
  +         return Lifecycle.getPhaseId()!=PhaseId.RENDER_RESPONSE && 
  +               Lifecycle.getPhaseId()!=null;
         }
         
         @Override