[jboss-svn-commits] JBL Code SVN: r36677 - labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/coordinator.

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

Author: jhalliday
Date: 2011-02-24 05:55:20 -0500 (Thu, 24 Feb 2011)
New Revision: 36677

Modified:
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/coordinator/ArjunaTransactionImple.java
Log:
Revert backport of JBTM-774


Modified: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/coordinator/ArjunaTransactionImple.java
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/coordinator/ArjunaTransactionImple.java	2011-02-24 10:44:24 UTC (rev 36676)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/coordinator/ArjunaTransactionImple.java	2011-02-24 10:55:20 UTC (rev 36677)
@@ -1317,24 +1317,19 @@
 		if ((currentStatus != Status.StatusActive)
 				&& (currentStatus != Status.StatusMarkedRollback))
 		{
-			/*
-			 * If XA compliant then return context even if we're inactive. Otherwise
-			 * throw Unavailable for consistency with other OTS implementations.
-			 */
-
-			if (!XA_COMPLIANT)
-				throw new Unavailable();
+			throw new Unavailable();
 		}
-
-		try
+		else
 		{
-			return propagationContext();
+			try
+			{
+				return propagationContext();
+			}
+			catch (Exception e)
+			{
+				throw new Unavailable();
+			}
 		}
-		catch (Exception e)
-		{
-			throw new UNKNOWN(e.toString(), ExceptionCodes.UNKNOWN_EXCEPTION,
-				CompletionStatus.COMPLETED_NO);
-		}
 	}
 
 	/*
@@ -2375,8 +2370,6 @@
 
 	static boolean _propagateRemainingTimeout = true;  // OTS 1.2 onwards supported this.
 
-	private static final boolean XA_COMPLIANT = true; // if we ever want to disable this then add an mbean option.
-
 	/**
 	 * @message com.arjuna.ats.internal.jts.orbspecific.coordinator.ipunknown
 	 *          {0} - unknown interposition type: {1}