From 6871012e469f6701e18871ec849fdd988f7b97c7 Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Sat, 31 Jan 2015 11:51:58 +0000 Subject: [PATCH] Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud) 92474: Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud) 92384: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.1) 92310: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.5) 92297: MNT-9899: Change default value for db.pool.max to 275 Reenabled the ConnectionPoolOverloadTest. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94883 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../alfresco/repo/transaction/ConnectionPoolOverloadTest.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/source/test-java/org/alfresco/repo/transaction/ConnectionPoolOverloadTest.java b/source/test-java/org/alfresco/repo/transaction/ConnectionPoolOverloadTest.java index f392693177..4245b6dd71 100644 --- a/source/test-java/org/alfresco/repo/transaction/ConnectionPoolOverloadTest.java +++ b/source/test-java/org/alfresco/repo/transaction/ConnectionPoolOverloadTest.java @@ -34,7 +34,6 @@ import org.apache.commons.lang.mutable.MutableInt; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.springframework.context.ApplicationContext; @@ -91,7 +90,6 @@ public class ConnectionPoolOverloadTest } @Test - @Ignore("The test will fail if db.pool.wait.max=-1 as all the threads will successfully open the transactions.") public void testOverload() throws Exception { List threads = new LinkedList();