[jboss-svn-commits] JBL Code SVN: r23778 - labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/interposition/coordinator.

[jboss-svn-commits at lists.jboss.org]

Author: mark.little at jboss.com
Date: 2008-11-07 07:46:54 -0500 (Fri, 07 Nov 2008)
New Revision: 23778

Modified:
   labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/interposition/coordinator/ServerTransaction.java
Log:
https://jira.jboss.org/jira/browse/JBTM-424

Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/interposition/coordinator/ServerTransaction.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/interposition/coordinator/ServerTransaction.java	2008-11-07 12:35:03 UTC (rev 23777)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/interposition/coordinator/ServerTransaction.java	2008-11-07 12:46:54 UTC (rev 23778)
@@ -164,25 +164,6 @@
 
 		_prepState = ActionStatus.PREPARED;
 
-		if (!_beforeCompleted && (_sync != null))
-		{
-			/*
-			 * Synchronizations should have been called by now if we have them!
-			 */
-
-			if (jtsLogger.loggerI18N.isWarnEnabled())
-			{
-				jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.orbspecific.interposition.coordinator.sycerror", new Object[]
-				{ "ServerTransaction.doPrepare" });
-			}
-
-			/*
-			 * Prevent commit!
-			 */
-
-			super.preventCommit();
-		}
-
 		/*
 		 * If we do not have an interposed synchronization then
 		 * before_completions will not have been called yet. So, do it now.
@@ -203,6 +184,25 @@
 			}
 		}
 
+		if (!_beforeCompleted && (_sync != null))
+		{
+		    /*
+		     * Synchronizations should have been called by now if we have them!
+		     */
+
+		    if (jtsLogger.loggerI18N.isWarnEnabled())
+		    {
+		        jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.orbspecific.interposition.coordinator.sycerror", new Object[]
+		                                                                                                                           { "ServerTransaction.doPrepare" });
+		    }
+
+		    /*
+		     * Prevent commit!
+		     */
+
+		    super.preventCommit();
+		}
+	              
 		int res = super.prepare(true);
 
 		/*