User: salborini
Date: 00/10/19 20:14:58
Modified: src/main/org/jboss/tm TxCapsule.java TxManager.java
Log:
-timedOut() must not rollback, or we lose the tx
-timeOut is now a long to allow big values (should be customizable in jboss.xml)
Revision Changes Path
1.16 +4 -8 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.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- TxCapsule.java 2000/10/18 14:28:53 1.15
+++ TxCapsule.java 2000/10/20 03:14:56 1.16
@@ -43,7 +43,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Marc Fleury</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Ole Husgaard</a>
*
- * @version $Revision: 1.15 $
+ * @version $Revision: 1.16 $
*/
class TxCapsule implements TimeoutTarget
{
@@ -68,7 +68,7 @@
* @param timeout The timeout for this transaction in milliseconds
* (timeouts are not yet implemented).
*/
- TxCapsule(TxManager tm, int timeout)
+ TxCapsule(TxManager tm, long timeout)
{
this(tm);
@@ -106,7 +106,7 @@
/**
* Prepare this instance for reuse.
*/
- void reUse(int timeout)
+ void reUse(long timeout)
{
if (!done)
throw new IllegalStateException();
@@ -170,11 +170,7 @@
status = Status.STATUS_MARKED_ROLLBACK;
// fall through..
case Status.STATUS_MARKED_ROLLBACK:
- endResources();
- rollbackResources();
- doAfterCompletion();
- gotHeuristic(null, XAException.XA_HEURRB);
- instanceDone();
+ // don't rollback for now, this messes up with the TxInterceptor.
return;
case Status.STATUS_PREPARING:
1.23 +3 -3 jboss/src/main/org/jboss/tm/TxManager.java
Index: TxManager.java
===================================================================
RCS file: /products/cvs/ejboss/jboss/src/main/org/jboss/tm/TxManager.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- TxManager.java 2000/10/11 10:54:26 1.22
+++ TxManager.java 2000/10/20 03:14:57 1.23
@@ -38,7 +38,7 @@
* @author Rickard �berg ([EMAIL PROTECTED])
* @author <a href="mailto:[EMAIL PROTECTED]">Marc Fleury</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Ole Husgaard</a>
- * @version $Revision: 1.22 $
+ * @version $Revision: 1.23 $
*/
public class TxManager
implements TransactionManager
@@ -51,7 +51,7 @@
* Default timeout in milliseconds.
* Must be >= 1000!
*/
- int timeOut = 60*1000;
+ long timeOut = 5*60*1000;
// Static --------------------------------------------------------
@@ -207,7 +207,7 @@
public int getTransactionTimeout()
{
- return timeOut / 1000;
+ return (int)(timeOut / 1000);
}
/*
