[seam-commits] Seam SVN: r9438 - branches/enterprise/JBPAPP_4_3_FP01/src/main/org/jboss/seam/jsf.

[seam-commits at lists.jboss.org]

Author: manaRH
Date: 2008-10-27 10:37:33 -0400 (Mon, 27 Oct 2008)
New Revision: 9438

Modified:
   branches/enterprise/JBPAPP_4_3_FP01/src/main/org/jboss/seam/jsf/SeamPhaseListener.java
Log:
JBPAPP-1308

Modified: branches/enterprise/JBPAPP_4_3_FP01/src/main/org/jboss/seam/jsf/SeamPhaseListener.java
===================================================================
--- branches/enterprise/JBPAPP_4_3_FP01/src/main/org/jboss/seam/jsf/SeamPhaseListener.java	2008-10-27 14:31:31 UTC (rev 9437)
+++ branches/enterprise/JBPAPP_4_3_FP01/src/main/org/jboss/seam/jsf/SeamPhaseListener.java	2008-10-27 14:37:33 UTC (rev 9438)
@@ -347,10 +347,10 @@
    {
       if ( Init.instance().isTransactionManagementEnabled() ) 
       {
-         commitOrRollback(PhaseId.INVOKE_APPLICATION);
+         commitOrRollback("after invoking page actions");
          if ( !facesContext.getResponseComplete() )
          {
-            begin(PhaseId.INVOKE_APPLICATION);
+            begin("before continuing render");
          }
       }
    }
@@ -579,11 +579,16 @@
       
    void begin(PhaseId phaseId) 
    {
+      begin("prior to phase: " + phaseId);
+   }
+   
+   void begin(String phaseString) 
+   {
       try 
       {
          if ( !Transaction.instance().isActiveOrMarkedRollback() )
          {
-            log.debug("beginning transaction prior to phase: " + phaseId);
+            log.debug("beginning transaction " + phaseString);
             Transaction.instance().begin();
          }
       }
@@ -595,16 +600,21 @@
    
    void commitOrRollback(PhaseId phaseId) 
    {
+      commitOrRollback("after phase: " + phaseId);
+   }
+      
+   void commitOrRollback(String phaseString) 
+   {
       try 
       {
          if ( Transaction.instance().isActive() )
          {
-            log.debug("committing transaction after phase: " + phaseId);
+            log.debug("committing transaction " + phaseString);
             Transaction.instance().commit();
          }
          else if ( Transaction.instance().isRolledBackOrMarkedRollback() )
          {
-            log.debug("rolling back transaction after phase: " + phaseId);
+            log.debug("rolling back transaction " + phaseString);
             Transaction.instance().rollback();
          }
       }