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

[Gavin King]

  User: gavin   
  Date: 06/10/27 09:54:23

  Modified:    src/main/org/jboss/seam/core  Exceptions.java
  Log:
  fix bug where handlers were called in wrong phase
  
  Revision  Changes    Path
  1.4       +4 -2      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.3
  retrieving revision 1.4
  diff -u -b -r1.3 -r1.4
  --- Exceptions.java	23 Oct 2006 18:09:29 -0000	1.3
  +++ Exceptions.java	27 Oct 2006 13:54:23 -0000	1.4
  @@ -126,7 +126,8 @@
               @Override
               public boolean isHandler(Exception e)
               {
  -               return clazz.isInstance(e);
  +               return clazz.isInstance(e) && 
  +                     Lifecycle.getPhaseId()==PhaseId.INVOKE_APPLICATION;
               }
               @Override
               protected boolean isEnd(Exception e)
  @@ -156,7 +157,8 @@
               @Override
               public boolean isHandler(Exception e)
               {
  -               return clazz.isInstance(e);
  +               return clazz.isInstance(e) && 
  +                     Lifecycle.getPhaseId()!=PhaseId.RENDER_RESPONSE;
               }
               @Override
               protected boolean isEnd(Exception e)