[jboss-svn-commits] JBL Code SVN: r23874 - in labs/jbosstm/trunk/XTS/WS-T/dev: src11/com/arjuna/wst11/messaging/engines and 1 other directory.

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

Author: adinn
Date: 2008-11-14 07:21:44 -0500 (Fri, 14 Nov 2008)
New Revision: 23874

Modified:
   labs/jbosstm/trunk/XTS/WS-T/dev/src10/com/arjuna/wst/messaging/engines/ParticipantCompletionCoordinatorEngine.java
   labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/engines/ParticipantCompletionCoordinatorEngine.java
Log:
corrected errors introduced into completed handling which depart from WSBA spec -- fixes for JBTM-404

Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src10/com/arjuna/wst/messaging/engines/ParticipantCompletionCoordinatorEngine.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src10/com/arjuna/wst/messaging/engines/ParticipantCompletionCoordinatorEngine.java	2008-11-14 11:00:49 UTC (rev 23873)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src10/com/arjuna/wst/messaging/engines/ParticipantCompletionCoordinatorEngine.java	2008-11-14 12:21:44 UTC (rev 23874)
@@ -246,10 +246,6 @@
             {
                 changeState(State.STATE_FAULTING) ;
             }
-            else if (current == State.STATE_CANCELING)
-            {
-        	state = State.STATE_COMPENSATING ;
-            }
         }
         
         if ((current == State.STATE_ACTIVE) || (current == State.STATE_CANCELING))

Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/engines/ParticipantCompletionCoordinatorEngine.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/engines/ParticipantCompletionCoordinatorEngine.java	2008-11-14 11:00:49 UTC (rev 23873)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src11/com/arjuna/wst11/messaging/engines/ParticipantCompletionCoordinatorEngine.java	2008-11-14 12:21:44 UTC (rev 23874)
@@ -215,7 +215,7 @@
      * @param arjunaContext The arjuna context.
      *
      * Active -> Completed
-     * Canceling -> Compensating
+     * Canceling -> Completed
      * Completed -> Completed
      * Closing -> Closing (resend Close)
      * Compensating -> (resend Compensate)
@@ -233,14 +233,10 @@
         synchronized(this)
         {
             current = state ;
-            if (current == State.STATE_ACTIVE)
+            if (current == State.STATE_ACTIVE || current == State.STATE_CANCELING)
             {
                 changeState(State.STATE_COMPLETED) ;
             }
-            else if (current == State.STATE_CANCELING)
-            {
-        	state = State.STATE_COMPENSATING ;
-            }
         }
 
         if (current == State.STATE_ACTIVE)