You are viewing a plain text version of this content. The canonical link for it is here.

Posted to derby-commits@db.apache.org by ka...@apache.org on 2006/08/26 16:39:07 UTC

svn commit: r437169 - /db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/SetQueryTimeoutTest.java

Author: kahatlen
Date: Sat Aug 26 07:39:04 2006
New Revision: 437169

URL: http://svn.apache.org/viewvc?rev=437169&view=rev
Log:
DERBY-705: Re-enable test which was disabled in DERBY-506 commit

Merged from trunk.

Modified:
    db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/SetQueryTimeoutTest.java

Modified: db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/SetQueryTimeoutTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/SetQueryTimeoutTest.java?rev=437169&r1=437168&r2=437169&view=diff
==============================================================================
--- db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/SetQueryTimeoutTest.java (original)
+++ db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/SetQueryTimeoutTest.java Sat Aug 26 07:39:04 2006
@@ -436,10 +436,8 @@
         // C - different stmt on different connection; should NOT time out
         // D - here just to create equal contention on conn1 and conn2
 
-        // FIXME: Should have used conn1 for statementB below, but
-        // this is blocked by DERBY-694
         PreparedStatement statementA = prepare(conn1, getFetchQuery("t"));
-        PreparedStatement statementB = prepare(conn2, getFetchQuery("t"));
+        PreparedStatement statementB = prepare(conn1, getFetchQuery("t"));
         PreparedStatement statementC = prepare(conn2, getFetchQuery("t"));
         PreparedStatement statementD = prepare(conn2, getFetchQuery("t"));