# HG changeset patch
# User Tom Gottfried <tom@intevation.de>
# Date 1417166500 -3600
# Node ID 8c615d738e84e8eae73c967afc873335b7afec1e
# Parent  2db7a949ff8bac746f7044e26dfd8deaf83fb6bf
maxWait should be set independendly of validationQuery.

diff -r 2db7a949ff8b -r 8c615d738e84 backend/src/main/java/org/dive4elements/river/backend/utils/DBCPConnectionProvider.java
--- a/backend/src/main/java/org/dive4elements/river/backend/utils/DBCPConnectionProvider.java	Thu Nov 27 20:25:31 2014 +0100
+++ b/backend/src/main/java/org/dive4elements/river/backend/utils/DBCPConnectionProvider.java	Fri Nov 28 10:21:40 2014 +0100
@@ -215,8 +215,10 @@
             String validationQuery = props.getProperty("validationQuery");
             if (validationQuery != null) {
                 ds.setValidationQuery(validationQuery);
-                ds.setMaxWait(1000); //TODO: make it configurable
             }
+
+            ds.setMaxWait(1000); //TODO: make it configurable
+
             // The BasicDataSource has lazy initialization
             // borrowing a connection will start the DataSource
             // and make sure it is configured correctly.