Return-Path: Delivered-To: apmail-db-derby-commits-archive@www.apache.org Received: (qmail 78131 invoked from network); 4 Jul 2007 00:40:17 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 4 Jul 2007 00:40:17 -0000 Received: (qmail 57504 invoked by uid 500); 4 Jul 2007 00:40:20 -0000 Delivered-To: apmail-db-derby-commits-archive@db.apache.org Received: (qmail 57437 invoked by uid 500); 4 Jul 2007 00:40:20 -0000 Mailing-List: contact derby-commits-help@db.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: "Derby Development" List-Id: Delivered-To: mailing list derby-commits@db.apache.org Received: (qmail 57426 invoked by uid 99); 4 Jul 2007 00:40:20 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 03 Jul 2007 17:40:20 -0700 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 03 Jul 2007 17:40:17 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 09E5D1A981A; Tue, 3 Jul 2007 17:39:57 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r553028 - /db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/XATransactionTest.java Date: Wed, 04 Jul 2007 00:39:56 -0000 To: derby-commits@db.apache.org From: myrnavl@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070704003957.09E5D1A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on 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();