1 files changed, 8 insertions, 2 deletions
diff --git a/src/main/java/io/trygvis/esper/testing/Config.java b/src/main/java/io/trygvis/esper/testing/Config.java
index 13ef1cd..5beb9bb 100644
--- a/src/main/java/io/trygvis/esper/testing/Config.java
+++ b/src/main/java/io/trygvis/esper/testing/Config.java
@@ -48,6 +48,8 @@ public class Config {
     public final String databaseUsername;
     public final String databasePassword;
 
+    private BoneCPDataSource dataSource;
+
     public Config(GitoriousConfig gitorious, long nexusUpdateInterval, long jenkinsUpdateInterval, String databaseUrl,
                   String databaseUsername, String databasePassword) {
         this.gitorious = gitorious;
@@ -89,12 +91,16 @@ public class Config {
     }
 
     public BoneCPDataSource createBoneCp() throws SQLException {
-        return new BoneCPDataSource(new BoneCPConfig(){{
+        if (dataSource != null) {
+            return dataSource;
+        }
+
+        return dataSource = new BoneCPDataSource(new BoneCPConfig() {{
             setJdbcUrl(databaseUrl);
             setUsername(databaseUsername);
             setPassword(databasePassword);
             setDefaultAutoCommit(false);
-            setCloseConnectionWatch(true);
+            setCloseConnectionWatch(false);
             setMaxConnectionsPerPartition(10);
         }});
     }