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

[Gavin King]

  User: gavin   
  Date: 07/06/20 11:53:33

  Modified:    src/main/org/jboss/seam/jsf  SeamPhaseListener.java
  Log:
  nested->toplevel
  get rid of client-side conversation support
  
  Revision  Changes    Path
  1.107     +4 -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.106
  retrieving revision 1.107
  diff -u -b -r1.106 -r1.107
  --- SeamPhaseListener.java	20 Jun 2007 08:23:17 -0000	1.106
  +++ SeamPhaseListener.java	20 Jun 2007 15:53:33 -0000	1.107
  @@ -299,8 +299,8 @@
         if ( Init.instance().isTransactionManagementEnabled() ) 
         {
            PhaseId phaseId = event.getPhaseId();
  -         boolean beginTran = phaseId==PhaseId.RESTORE_VIEW || 
  -               ( phaseId==PhaseId.RENDER_RESPONSE && !Init.instance().isClientSideConversations() );
  +         boolean beginTran = phaseId==PhaseId.RESTORE_VIEW || phaseId==PhaseId.RENDER_RESPONSE;
  +               //( phaseId==PhaseId.RENDER_RESPONSE && !Init.instance().isClientSideConversations() );
            
            if (beginTran) 
            {
  @@ -317,7 +317,8 @@
            boolean commitTran = phaseId==PhaseId.INVOKE_APPLICATION || 
                  event.getFacesContext().getRenderResponse() || //TODO: no need to commit the tx if we failed to restore the view
                  event.getFacesContext().getResponseComplete() ||
  -               ( phaseId==PhaseId.RENDER_RESPONSE && !Init.instance().isClientSideConversations() );
  +               phaseId==PhaseId.RENDER_RESPONSE;
  +               //( phaseId==PhaseId.RENDER_RESPONSE && !Init.instance().isClientSideConversations() );
            
            if (commitTran)
            {