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 2009/05/07 10:02:00 UTC
svn commit: r772538 - in /db/derby/code/branches/10.5: ./
java/testing/org/apache/derbyTesting/functionTests/tests/store/IndexSplitDeadlockTest.java
Author: kahatlen
Date: Thu May 7 08:01:56 2009
New Revision: 772538
URL: http://svn.apache.org/viewvc?rev=772538&view=rev
Log:
DERBY-4218: "Table/View 'MAX_SCAN' does not exist" in IndexSplitDeadlockTest
Merged fix from trunk (revision 772534).
Modified:
db/derby/code/branches/10.5/ (props changed)
db/derby/code/branches/10.5/java/testing/org/apache/derbyTesting/functionTests/tests/store/IndexSplitDeadlockTest.java
Propchange: db/derby/code/branches/10.5/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 7 08:01:56 2009
@@ -1 +1 @@
-/db/derby/code/trunk:772090,772449
+/db/derby/code/trunk:772090,772449,772534
Modified: db/derby/code/branches/10.5/java/testing/org/apache/derbyTesting/functionTests/tests/store/IndexSplitDeadlockTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.5/java/testing/org/apache/derbyTesting/functionTests/tests/store/IndexSplitDeadlockTest.java?rev=772538&r1=772537&r2=772538&view=diff
==============================================================================
--- db/derby/code/branches/10.5/java/testing/org/apache/derbyTesting/functionTests/tests/store/IndexSplitDeadlockTest.java (original)
+++ db/derby/code/branches/10.5/java/testing/org/apache/derbyTesting/functionTests/tests/store/IndexSplitDeadlockTest.java Thu May 7 08:01:56 2009
@@ -62,9 +62,9 @@
}
protected void tearDown() throws Exception {
+ // Rollback all uncommitted operations so that we don't hold any
+ // locks that may block the other threads.
rollback();
- setAutoCommit(false); // required by JDBC.dropSchema()
- JDBC.dropSchema(getConnection().getMetaData(), "APP");
// Go through all the threads and call waitFor() so that we
// detect errors that happened in another thread.
@@ -74,6 +74,12 @@
}
threads = null;
+ // All the other threads have finished. Now, remove everything from
+ // the APP schema so that we don't leave anything around for subsequent
+ // tests.
+ setAutoCommit(false); // required by JDBC.dropSchema()
+ JDBC.dropSchema(getConnection().getMetaData(), "APP");
+
super.tearDown();
}