[jboss-svn-commits] JBL Code SVN: r26813 - in labs/jbosstm/trunk: ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore/jca and 3 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Jun 3 12:13:05 EDT 2009
Author: mark.little at jboss.com
Date: 2009-06-03 12:13:05 -0400 (Wed, 03 Jun 2009)
New Revision: 26813
Modified:
labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/resources/spi/XATerminatorExtensions.java
labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore/jca/SubordinateTransaction.java
labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore/jca/XATerminatorImple.java
labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore/subordinate/SubordinateAtomicAction.java
labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore/subordinate/TransactionImple.java
labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/transaction/jts/jca/XATerminatorImple.java
labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/transaction/jts/subordinate/SubordinateAtomicTransaction.java
labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/transaction/jts/subordinate/TransactionImple.java
Log:
Removed afterCompletion from XATerminatorExtensions as not required (currently).
Modified: labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/resources/spi/XATerminatorExtensions.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/resources/spi/XATerminatorExtensions.java 2009-06-03 16:00:21 UTC (rev 26812)
+++ labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/resources/spi/XATerminatorExtensions.java 2009-06-03 16:13:05 UTC (rev 26813)
@@ -49,7 +49,11 @@
/*
* Synchronizations aren't part of XA, so that's why it would be nice to have these
* handled by a separate instance, as well as being architecturally symmetrical with
- * OTS. But it's not a big deal.
+ * OTS. But it's not a big deal. Plus, this isn't really symmetrical either, since we
+ * don't need afterCompletion.
+ *
+ * TODO check whether it makes sense to resurrect afterCompletion here for, say,
+ * compensations.
*/
/**
@@ -61,16 +65,4 @@
*/
public boolean beforeCompletion (Xid xid) throws javax.transaction.SystemException;
-
- /**
- * Call afterCompletion on the registered instance. Exceptions will be logged but have no
- * affect on the transaction (which has already completed.)
- *
- * @param xid the transaction instance
- * @param status the transaction status (values from JTA Status).
- * @return success (or not).
- * @throws javax.transaction.SystemException
- */
-
- public boolean afterCompletion (Xid xid, int status) throws javax.transaction.SystemException;
}
Modified: labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore/jca/SubordinateTransaction.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore/jca/SubordinateTransaction.java 2009-06-03 16:00:21 UTC (rev 26812)
+++ labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore/jca/SubordinateTransaction.java 2009-06-03 16:13:05 UTC (rev 26813)
@@ -96,15 +96,7 @@
*/
public boolean doBeforeCompletion () throws SystemException;
-
- /**
- * Run afterCompletion on Synchronizations.
- *
- * @return outcome
- */
-
- public boolean doAfterCompletion (int status) throws SystemException;
-
+
public boolean activated();
public void recover();
Modified: labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore/jca/XATerminatorImple.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore/jca/XATerminatorImple.java 2009-06-03 16:00:21 UTC (rev 26812)
+++ labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore/jca/XATerminatorImple.java 2009-06-03 16:13:05 UTC (rev 26813)
@@ -482,34 +482,7 @@
throw e;
}
}
-
- /*
- * Remember that status is JTS status.
- * @see com.arjuna.ats.internal.jta.resources.spi.XATerminatorExtensions#afterCompletion(javax.transaction.xa.Xid, int)
- */
-
- public boolean afterCompletion (Xid xid, int status) throws javax.transaction.SystemException
- {
- try
- {
- SubordinateTransaction tx = SubordinationManager
- .getTransactionImporter().getImportedTransaction(xid);
- if (tx == null)
- throw new UnexpectedConditionException();
-
- return tx.doAfterCompletion(status);
- }
- catch (final Exception ex)
- {
- UnexpectedConditionException e = new UnexpectedConditionException();
-
- e.initCause(ex);
-
- throw e;
- }
- }
-
private boolean _recoveryStarted = false;
}
Modified: labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore/subordinate/SubordinateAtomicAction.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore/subordinate/SubordinateAtomicAction.java 2009-06-03 16:00:21 UTC (rev 26812)
+++ labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore/subordinate/SubordinateAtomicAction.java 2009-06-03 16:13:05 UTC (rev 26813)
@@ -28,8 +28,6 @@
package com.arjuna.ats.internal.jta.transaction.arjunacore.subordinate;
-import javax.transaction.Status;
-
import com.arjuna.ats.arjuna.AtomicAction;
import com.arjuna.ats.arjuna.common.Uid;
import com.arjuna.ats.arjuna.coordinator.ActionStatus;
@@ -257,20 +255,6 @@
return _beforeOutcome;
}
- public boolean doAfterCompletion (int status)
- {
- if (!_doneAfter)
- {
- int theStatus = (status == Status.STATUS_COMMITTED) ? ActionStatus.COMMITTED : ActionStatus.ABORTED;
-
- _afterOutcome = super.afterCompletion(theStatus);
-
- _doneAfter = true;
- }
-
- return _afterOutcome;
- }
-
/**
* For crash recovery purposes.
*
@@ -311,6 +295,4 @@
private boolean _doneBefore = false;
private boolean _beforeOutcome = false;
- private boolean _doneAfter = false;
- private boolean _afterOutcome = false;
}
Modified: labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore/subordinate/TransactionImple.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore/subordinate/TransactionImple.java 2009-06-03 16:00:21 UTC (rev 26812)
+++ labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore/subordinate/TransactionImple.java 2009-06-03 16:13:05 UTC (rev 26813)
@@ -328,26 +328,7 @@
throw unexpectedConditionException;
}
}
-
- public boolean doAfterCompletion (int status) throws javax.transaction.SystemException
- {
- try
- {
- SubordinateAtomicAction subAct = (SubordinateAtomicAction) super._theTransaction;
-
- return subAct.doAfterCompletion(status);
- }
- catch (final Exception ex)
- {
- ex.printStackTrace();
- UnexpectedConditionException unexpectedConditionException = new UnexpectedConditionException(ex.toString());
- unexpectedConditionException.initCause(ex);
-
- throw unexpectedConditionException;
- }
- }
-
public String toString ()
{
if (super._theTransaction == null)
Modified: labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/transaction/jts/jca/XATerminatorImple.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/transaction/jts/jca/XATerminatorImple.java 2009-06-03 16:00:21 UTC (rev 26812)
+++ labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/transaction/jts/jca/XATerminatorImple.java 2009-06-03 16:13:05 UTC (rev 26813)
@@ -408,33 +408,6 @@
}
}
- /*
- * Remember that status is JTS status.
- * @see com.arjuna.ats.internal.jta.resources.spi.XATerminatorExtensions#afterCompletion(javax.transaction.xa.Xid, int)
- */
-
- public boolean afterCompletion (Xid xid, int status) throws javax.transaction.SystemException
- {
- try
- {
- SubordinateTransaction tx = SubordinationManager
- .getTransactionImporter().getImportedTransaction(xid);
-
- if (tx == null)
- throw new UnexpectedConditionException();
-
- return tx.doAfterCompletion(status);
- }
- catch (final Exception ex)
- {
- UnexpectedConditionException e = new UnexpectedConditionException();
-
- e.initCause(ex);
-
- throw e;
- }
- }
-
private boolean _recoveryStarted = false;
}
Modified: labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/transaction/jts/subordinate/SubordinateAtomicTransaction.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/transaction/jts/subordinate/SubordinateAtomicTransaction.java 2009-06-03 16:00:21 UTC (rev 26812)
+++ labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/transaction/jts/subordinate/SubordinateAtomicTransaction.java 2009-06-03 16:13:05 UTC (rev 26813)
@@ -219,34 +219,6 @@
return false;
}
- public boolean doAfterCompletion (int status) throws SystemException
- {
- ServerTransaction stx = getTransaction();
-
- try
- {
- if (stx != null)
- {
- /*
- * Convert from JTA status to OTS status.
- */
-
- org.omg.CosTransactions.Status s = ((status == Status.STATUS_COMMITTED) ? org.omg.CosTransactions.Status.StatusCommitted :
- org.omg.CosTransactions.Status.StatusRolledBack);
-
- stx.doAfterCompletion(s);
-
- return true;
- }
- }
- catch (final Exception ex)
- {
- ex.printStackTrace();
- }
-
- return false;
- }
-
/**
* By default the BasicAction class only allows the termination of a
* transaction if it's the one currently associated with the thread. We
@@ -279,7 +251,4 @@
private boolean _doneBefore = false;
private boolean _beforeOutcome = false;
- private boolean _doneAfter = false;
- private boolean _afterOutcome = false;
-
}
Modified: labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/transaction/jts/subordinate/TransactionImple.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/transaction/jts/subordinate/TransactionImple.java 2009-06-03 16:00:21 UTC (rev 26812)
+++ labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/transaction/jts/subordinate/TransactionImple.java 2009-06-03 16:13:05 UTC (rev 26813)
@@ -394,26 +394,7 @@
throw unexpectedConditionException;
}
}
-
- public boolean doAfterCompletion (int status) throws javax.transaction.SystemException
- {
- try
- {
- SubordinateAtomicTransaction subAct = (SubordinateAtomicTransaction) super._theTransaction;
-
- return subAct.doAfterCompletion(status);
- }
- catch (final Exception ex)
- {
- ex.printStackTrace();
- UnexpectedConditionException unexpectedConditionException = new UnexpectedConditionException(ex.toString());
- unexpectedConditionException.initCause(ex);
-
- throw unexpectedConditionException;
- }
- }
-
public String toString ()
{
if (super._theTransaction == null)
More information about the jboss-svn-commits
mailing list