svn commit: r553028 - /db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/XATransactionTest.java

[my...@apache.org]

Author: myrnavl
Date: Tue Jul  3 17:39:55 2007
New Revision: 553028

URL: http://svn.apache.org/viewvc?view=rev&rev=553028
Log:
DERBY-2871 - revert revision 552621, it causes an intermittent problem.

Modified:
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/XATransactionTest.java

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/XATransactionTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/XATransactionTest.java?view=diff&rev=553028&r1=553027&r2=553028
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/XATransactionTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/XATransactionTest.java Tue Jul  3 17:39:55 2007
@@ -190,21 +190,7 @@
             conn = xaConn.getConnection();
 
             Xid xid = createXid(123, i);
-
-            if (i % timeoutCommitEveryStatement == 0) {
-                // Setup the higher value for the transaction timeout
-                // if the transaction is going to be committed
-                // just to be sure that it would not be rolled back
-                // before commit due to a garbage collection
-                // in progress, etc.
-                xaRes.setTransactionTimeout(60);
-            } else {
-                // We will set the transaction timeout value low
-                // for transactions going to be rolled back to keep
-                // the number of pending transactions low
-                xaRes.setTransactionTimeout(8);
-            }
-
+            xaRes.setTransactionTimeout(5);
             xaRes.start(xid, XAResource.TMNOFLAGS);
 
             stm = conn.createStatement();