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

[Gavin King]

  User: gavin   
  Date: 07/06/18 13:27:23

  Modified:    src/main/org/jboss/seam/jsf  SeamPhaseListener.java
  Log:
  JBSEAM-1112   
  fix a problem with interception of pageflow actions
  
  Revision  Changes    Path
  1.102     +3 -3      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.101
  retrieving revision 1.102
  diff -u -b -r1.101 -r1.102
  --- SeamPhaseListener.java	15 Jun 2007 07:24:56 -0000	1.101
  +++ SeamPhaseListener.java	18 Jun 2007 17:27:23 -0000	1.102
  @@ -373,11 +373,11 @@
         {
            Pages.instance().redirectToNoConversationView();
         }
  +      Manager.instance().handleConversationPropagation(parameters);
         if ( Init.instance().isJbpmInstalled() )
         {
            Pageflow.instance().validatePageflow();
         }
  -      Manager.instance().handleConversationPropagation(parameters);
         
         if ( log.isDebugEnabled() )
         {
  @@ -395,7 +395,7 @@
            Events.instance().raiseEvent("org.jboss.seam.beforePhase", event);
         }
         
  -      if ( Contexts.isConversationContextActive() && Init.instance().isJbpmInstalled() && Pageflow.instance().isInProcess() )
  +      /*if ( Contexts.isConversationContextActive() && Init.instance().isJbpmInstalled() && Pageflow.instance().isInProcess() )
         {
            String name;
            PhaseId phaseId = event.getPhaseId();
  @@ -420,7 +420,7 @@
               return;
            }
            Pageflow.instance().processEvents(name);
  -      }
  +      }*/
      }
      
      public void raiseEventsAfterPhase(PhaseEvent event)