OW2 Consortium jotm

Compare Revisions

Ignore whitespace Rev 1124 → Rev 1125

/branches/jotm-2-0-11-br/jotm/src/main/org/objectweb/jotm/TransactionImpl.java
110,6 → 110,8
*/
private int localstatus = Status.STATUS_ACTIVE;
 
private boolean toremove = false;
 
// ------------------------------------------------------------------
// Constructors
// ------------------------------------------------------------------
155,9 → 157,11
try {
makeSubCoord();
} catch (RollbackException e) {
toremove= true;
TraceTm.jotm.debug("already rolled back");
localstatus = Status.STATUS_ROLLEDBACK;
} catch (SystemException e) {
toremove= true;
TraceTm.jotm.error("cannot make subcoordinator");
localstatus = Status.STATUS_ROLLEDBACK;
}
1070,6 → 1074,10
Current.getCurrent().incrementBeginCounter();
}
 
public boolean toRemove() {
return toremove;
}
 
public void cleanup() {
TraceTm.jta.debug("");
if (subcoord != null) {
/branches/jotm-2-0-11-br/jotm/src/main/org/objectweb/jotm/Current.java
1045,6 → 1045,11
// See bug #313564.
// Moreover, iiop would not work because remote called are done
// even inside the ots interceptor (_get_reference)
// Must only remove it if transaction was already rolled back
// when the request has arrived.
if (tx.toRemove()) {
forgetTx(tx.getXid());
}
threadTx.set(null);
if (TraceTm.jta.isDebugEnabled()) {
TraceTm.jta.debug("threadTx.set= null");
1066,7 → 1071,8
TraceTm.jta.debug("new Tx");
}
tx = new TransactionImpl(pctx);
// Always associate thread with Tx, especially if it is rolled back!
// In case the Tx is already rolled back, this has to be undone
// at some time.
putTxXid(xid, tx);
 
// sets the time stamp for the transaction
1784,7 → 1790,9
*/
synchronized void incrementBeginCounter() {
nb_bg_tx++;
//TraceTm.jta.debug("nb_bg_tx="+nb_bg_tx);
if (TraceTm.jta.isDebugEnabled()) {
TraceTm.jta.debug("nb_bg_tx="+nb_bg_tx);
}
}
 
/**
1800,7 → 1808,9
*/
synchronized void incrementRollbackCounter() {
nb_rb_tx++;
//TraceTm.jta.debug("nb_rb_tx="+nb_rb_tx);
if (TraceTm.jta.isDebugEnabled()) {
TraceTm.jta.debug("nb_rb_tx="+nb_rb_tx);
}
}
 
/**
1816,7 → 1826,9
*/
synchronized void incrementCommitCounter() {
nb_cm_tx++;
//TraceTm.jta.debug("nb_cm_tx="+nb_cm_tx);
if (TraceTm.jta.isDebugEnabled()) {
TraceTm.jta.debug("nb_cm_tx="+nb_cm_tx);
}
}
 
/**
1843,6 → 1855,9
*/
synchronized void incrementExpiredCounter() {
nb_to++;
if (TraceTm.jta.isDebugEnabled()) {
TraceTm.jta.debug("nb_to="+nb_to);
}
}
 
/**