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/06/17 17:33:03 UTC
svn commit: r785676 - in /db/derby/code/branches/10.5: ./
java/testing/org/apache/derbyTesting/functionTests/tests/store/IndexSplitDeadlockTest.java
Author: kahatlen
Date: Wed Jun 17 15:33:03 2009
New Revision: 785676
URL: http://svn.apache.org/viewvc?rev=785676&view=rev
Log:
DERBY-4273: A lock could not be obtained within the time requested error in testBTreeForwardScan_fetchRows_resumeAfterWait_nonUnique_split
Merged fix from trunk (revision 785662).
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 Wed Jun 17 15:33:03 2009
@@ -1 +1 @@
-/db/derby/code/trunk:772090,772449,772534,774281,779681,782991,785163
+/db/derby/code/trunk:772090,772449,772534,774281,779681,782991,785163,785662
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=785676&r1=785675&r2=785676&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 Wed Jun 17 15:33:03 2009
@@ -57,7 +57,6 @@
Test test = TestConfiguration.embeddedSuite(
IndexSplitDeadlockTest.class);
test = new CleanDatabaseTestSetup(test);
- test = DatabasePropertyTestSetup.setLockTimeouts(test, 2, 4);
return test;
}