[jboss-svn-commits] JBL Code SVN: r14301 - in labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats: jta/utils and 1 other directory.

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

Author: mark.little at jboss.com
Date: 2007-08-16 06:35:19 -0400 (Thu, 16 Aug 2007)
New Revision: 14301

Modified:
   labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/utils/arjunacore/StatusConverter.java
   labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/jta/utils/JTAHelper.java
Log:
"better" map extensive Arjuna statuses to coarse grained JTA statuses. A clean mapping isn't possible, but given the JTA specification limitations (and text around status codes), it's the best we can do.

Modified: labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/utils/arjunacore/StatusConverter.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/utils/arjunacore/StatusConverter.java	2007-08-16 09:46:04 UTC (rev 14300)
+++ labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/utils/arjunacore/StatusConverter.java	2007-08-16 10:35:19 UTC (rev 14301)
@@ -43,6 +43,9 @@
 		case ActionStatus.RUNNING:
 			return javax.transaction.Status.STATUS_ACTIVE;
 		case ActionStatus.COMMITTED:
+		case ActionStatus.H_COMMIT:
+		case ActionStatus.H_HAZARD:  // not exactly true, but ...
+		case ActionStatus.H_MIXED:
 			return javax.transaction.Status.STATUS_COMMITTED;
 		case ActionStatus.COMMITTING:
 			return javax.transaction.Status.STATUS_COMMITTING;
@@ -53,6 +56,7 @@
 		case ActionStatus.PREPARED:
 			return javax.transaction.Status.STATUS_PREPARED;
 		case ActionStatus.ABORTED:
+		case ActionStatus.H_ROLLBACK:
 			return javax.transaction.Status.STATUS_ROLLEDBACK;
 		case ActionStatus.INVALID:
 			return javax.transaction.Status.STATUS_UNKNOWN;

Modified: labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/jta/utils/JTAHelper.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/jta/utils/JTAHelper.java	2007-08-16 09:46:04 UTC (rev 14300)
+++ labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/jta/utils/JTAHelper.java	2007-08-16 10:35:19 UTC (rev 14301)
@@ -31,9 +31,6 @@
 
 package com.arjuna.ats.jta.utils;
 
-import javax.transaction.*;
-import javax.transaction.xa.*;
-
 /**
  * Some useful utility routines.
  */