User: mulder
Date: 00/09/08 08:24:59
Modified: src/main/org/jboss/tm TxCapsule.java
Log:
Fix a typo - I think.
It doesn't look like any of the Heuristic Exceptions change the status
during a Prepare or Commit failure, so I don't see when this clause would
ever kick in.
Revision Changes Path
1.4 +10 -10 jboss/src/main/org/jboss/tm/TxCapsule.java
Index: TxCapsule.java
===================================================================
RCS file: /products/cvs/ejboss/jboss/src/main/org/jboss/tm/TxCapsule.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TxCapsule.java 2000/09/08 02:25:01 1.3
+++ TxCapsule.java 2000/09/08 15:24:59 1.4
@@ -46,7 +46,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Marc Fleury</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Ole Husgaard</a>
*
- * @version $Revision: 1.3 $
+ * @version $Revision: 1.4 $
*/
class TxCapsule implements TimeoutTarget
{
@@ -95,7 +95,7 @@
transaction = new TransactionImpl(tm, hashCode, xid);
this.tm = tm;
}
-
+
// Public --------------------------------------------------------
/**
@@ -169,7 +169,7 @@
/**
* Return the transaction encapsulated here.
- */
+ */
Transaction getTransaction() {
return transaction;
}
@@ -235,7 +235,7 @@
// Two phase commit
if (!prepareResources()) {
- boolean commitDecision =
+ boolean commitDecision =
status == Status.STATUS_PREPARED &&
(heuristicCode == HEUR_NONE ||
heuristicCode == XAException.XA_HEURCOM);
@@ -564,19 +564,19 @@
// A list of synchronizations to call back on commit (before and after)
private ArrayList sync = new ArrayList();
-
+
// A list of the XARessources to 2phi commit (prepare and commit)
private ArrayList resources = new ArrayList();
// Suspended XAResources are in this set
private Set suspendedResources = new HashSet();
- private Xid xid; // XA legacy
+ private Xid xid; // XA legacy
private int status; // status code
private int heuristicCode = HEUR_NONE; // heuristics status
private long start;
private Timeout timeout;
-
+
// The public face of the capsule a JTA implementation
private Transaction transaction;
@@ -815,7 +815,7 @@
// Abort prepare on state change.
if (status != Status.STATUS_PREPARING)
return false;
-
+
XAResource resource = (XAResource)resources.get(i);
try {
@@ -876,7 +876,7 @@
// Abort commit on state change.
if (status != Status.STATUS_COMMITTING)
return;
-
+
XAResource resource = (XAResource)resources.get(i);
try {
@@ -901,7 +901,7 @@
}
}
- if (status != Status.STATUS_COMMITTING)
+ if (status == Status.STATUS_COMMITTING)
status = Status.STATUS_COMMITTED;
}
