User: osh
Date: 00/09/10 11:39:08
Modified: src/main/org/jboss/tm TxCapsule.java
Log:
State change on tx timeout
Revision Changes Path
1.5 +3 -5 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TxCapsule.java 2000/09/08 15:24:59 1.4
+++ TxCapsule.java 2000/09/10 18:39:08 1.5
@@ -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.4 $
+ * @version $Revision: 1.5 $
*/
class TxCapsule implements TimeoutTarget
{
@@ -126,11 +126,9 @@
// We are in the second commit phase, and have decided
// to commit, but now we get a timeout and should rollback.
// So we end up with a mixed decision.
- suspendedResourcesDone();
- rollbackResources();
- doAfterCompletion();
gotHeuristic(null, XAException.XA_HEURMIX);
- return;
+ status = Status.STATUS_MARKED_ROLLBACK;
+ return; // commit will fail
case Status.STATUS_PREPARED:
// This is bad:
