Permalink
Browse files

JBTM-1327 keep the transaction associated with the thread during prep…

…are to preserve locking order
  • Loading branch information...
1 parent 8914f35 commit 63321f7b86558fa6cb819e290b20b03e70398c28 @mmusgrov mmusgrov committed Nov 20, 2012
View
8 ...una/ats/internal/jts/orbspecific/interposition/resources/arjuna/ServerTopLevelAction.java
@@ -174,7 +174,7 @@ public Resource getReference ()
ServerTransaction theTransaction = (ServerTransaction) _theControl.getImplHandle();
- // ThreadActionData.pushAction(theTransaction); // unnecessary if context goes with all calls.
+ ThreadActionData.pushAction(theTransaction); // LockManager needs to know if there is a transaction
int result = TwoPhaseOutcome.PREPARE_NOTOK;
@@ -285,7 +285,7 @@ public void rollback () throws HeuristicCommit, HeuristicMixed, HeuristicHazard,
ServerTransaction theTransaction = (ServerTransaction) _theControl.getImplHandle();
- // ThreadActionData.pushAction(theTransaction);
+ ThreadActionData.pushAction(theTransaction); // LockManager needs to know if there is a transaction
int actionStatus = theTransaction.status();
@@ -381,7 +381,7 @@ public void commit () throws NotPrepared, HeuristicRollback, HeuristicMixed, Heu
ServerTransaction theTransaction = (ServerTransaction) _theControl.getImplHandle();
- // ThreadActionData.pushAction(theTransaction);
+ ThreadActionData.pushAction(theTransaction); // LockManager needs to know if there is a transaction
int actionStatus = theTransaction.status();
boolean notPrepared = false;
@@ -485,7 +485,7 @@ public void commit_one_phase () throws HeuristicHazard, SystemException
throw new INVALID_TRANSACTION(ExceptionCodes.NO_TRANSACTION, CompletionStatus.COMPLETED_NO);
}
- // ThreadActionData.pushAction(theTransaction);
+ ThreadActionData.pushAction(theTransaction); // LockManager needs to know if there is a transaction
try
{

0 comments on commit 63321f7

Please sign in to comment.