Merged V2.2 to HEAD

7633: Fixed compilation fallout from PropertyValue changes
   7640: Build Fix - missing purges for some stores
   7645: Fixed line endings
   7646: Tweaks to MySQL QName upgrade script after doing large 1.4.3 to 2.2 upgrade.
   7648: Give more time per thread to cater for slow executions of test threads
   7649: Fixed QName query flush modes


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8440 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2008-03-06 19:42:52 +00:00
parent d389ff1936
commit ab80624ce0
8 changed files with 275 additions and 200 deletions

View File

@@ -200,8 +200,8 @@ public class QNameDAOTest extends TestCase
readyLatch.await(5, TimeUnit.SECONDS);
// Let the threads go
startLatch.countDown();
// Wait for them all to be done (within limits)
doneLatch.await(threadCount, TimeUnit.SECONDS);
// Wait for them all to be done (within limit of 10 seconds per thread)
doneLatch.await(threadCount * 10, TimeUnit.SECONDS);
if (doneLatch.getCount() > 0)
{
fail("Still waiting for threads to finish");