From 99a54ab938981cc5d80fa9ab22b68eace20adc42 Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Sat, 31 Jan 2015 11:51:28 +0000 Subject: [PATCH] Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud) 92471: Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud) 92381: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.1) 92307: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.5) 92294: Merged DEREK/MNT-9899-V42 (4.2.3) to V4.1-BUG-FIX (4.1.10) 71894: MNT-9899 : Change default value for db.pool.max to 275 Hardened the test to rollback all of the opened transactions. Added installer configuration to set the max_connections of the shipped PostgreSQL. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94880 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../repo/transaction/ConnectionPoolOverloadTest.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/source/test-java/org/alfresco/repo/transaction/ConnectionPoolOverloadTest.java b/source/test-java/org/alfresco/repo/transaction/ConnectionPoolOverloadTest.java index fe07d82a09..f392693177 100644 --- a/source/test-java/org/alfresco/repo/transaction/ConnectionPoolOverloadTest.java +++ b/source/test-java/org/alfresco/repo/transaction/ConnectionPoolOverloadTest.java @@ -188,6 +188,16 @@ public class ConnectionPoolOverloadTest interrupt(); fail("Thread should fail with ConnectionPoolException."); } + + try + { + sleep(dbPoolWaitMax*2); + } + catch (InterruptedException e) + { + interrupt(); + } + interrupt(); } @Override