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

[Peter Muir]

  User: pmuir   
  Date: 08/01/07 10:29:18

  Modified:    src/main/org/jboss/seam/jsf  SeamPhaseListener.java
  Log:
  JBSEAM-2139
  
  Revision  Changes    Path
  1.118     +6 -1      jboss-seam/src/main/org/jboss/seam/jsf/SeamPhaseListener.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: SeamPhaseListener.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/jsf/SeamPhaseListener.java,v
  retrieving revision 1.117
  retrieving revision 1.118
  diff -u -b -r1.117 -r1.118
  --- SeamPhaseListener.java	22 Nov 2007 18:37:29 -0000	1.117
  +++ SeamPhaseListener.java	7 Jan 2008 15:29:17 -0000	1.118
  @@ -527,7 +527,7 @@
            
            Manager.instance().handleConversationPropagation(parameters);
            
  -         if ( Init.instance().isJbpmInstalled() )
  +         if ( Init.instance().isJbpmInstalled() && !isExceptionHandlerRedirect() )
            {
               Pageflow.instance().validatePageflow(facesContext);
            }
  @@ -563,6 +563,11 @@
         }
      }
         
  +   private boolean isExceptionHandlerRedirect()
  +   {
  +      return Contexts.getConversationContext().isSet("org.jboss.seam.handledException");
  +   }
  +      
      void begin(PhaseId phaseId) 
      {
         try