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

[Gavin King]

  User: gavin   
  Date: 07/06/24 02:34:33

  Modified:    src/main/org/jboss/seam/jsf  SeamPhaseListener.java
  Log:
  got rid of TransactionListener, merged with the Transaction package, for more consistent behavior across diff types of tx management
  
  Revision  Changes    Path
  1.111     +0 -10     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.110
  retrieving revision 1.111
  diff -u -b -r1.110 -r1.111
  --- SeamPhaseListener.java	23 Jun 2007 07:38:07 -0000	1.110
  +++ SeamPhaseListener.java	24 Jun 2007 06:34:33 -0000	1.111
  @@ -26,14 +26,12 @@
   import org.jboss.seam.contexts.Context;
   import org.jboss.seam.contexts.Contexts;
   import org.jboss.seam.contexts.FacesLifecycle;
  -import org.jboss.seam.core.BasicTransactionListener;
   import org.jboss.seam.core.ConversationList;
   import org.jboss.seam.core.ConversationPropagation;
   import org.jboss.seam.core.ConversationStack;
   import org.jboss.seam.core.Events;
   import org.jboss.seam.core.Init;
   import org.jboss.seam.core.Manager;
  -import org.jboss.seam.core.TransactionListener;
   import org.jboss.seam.exceptions.Exceptions;
   import org.jboss.seam.faces.FacesManager;
   import org.jboss.seam.faces.FacesMessages;
  @@ -573,16 +571,12 @@
      
      void commitOrRollback(PhaseId phaseId) 
      {
  -      boolean success=false;
  -      TransactionListener transactionListener = BasicTransactionListener.instance();
         try 
         {
            if ( Transaction.instance().isActive() )
            {
               log.debug("committing transaction after phase: " + phaseId);
  -            transactionListener.beforeSeamManagedTransactionCompletion();
               Transaction.instance().commit();
  -            success=true;
            }
            else if ( Transaction.instance().isRolledBackOrMarkedRollback() )
            {
  @@ -594,10 +588,6 @@
         {
            throw new IllegalStateException("Could not commit transaction", e);
         }
  -      finally
  -      {
  -         transactionListener.afterSeamManagedTransactionCompletion(success);
  -      }
      }
      
   }