diff backend/src/main/java/org/dive4elements/river/backend/utils/DBCPConnectionProvider.java @ 8485:026f4c684ee5

Make maxWait configurable and wait for 30 seconds
author "Tom Gottfried <tom@intevation.de>"
date Fri, 28 Nov 2014 16:34:40 +0100
parents 8c615d738e84
children d718edbf0b0c
line wrap: on
line diff
--- a/backend/src/main/java/org/dive4elements/river/backend/utils/DBCPConnectionProvider.java	Fri Nov 28 10:21:40 2014 +0100
+++ b/backend/src/main/java/org/dive4elements/river/backend/utils/DBCPConnectionProvider.java	Fri Nov 28 16:34:40 2014 +0100
@@ -217,7 +217,17 @@
                 ds.setValidationQuery(validationQuery);
             }
 
-            ds.setMaxWait(1000); //TODO: make it configurable
+            String maxWait = props.getProperty("maxWait");
+            if (maxWait != null) {
+                try {
+                    ds.setMaxWait(Integer.parseInt(maxWait));
+                }
+                catch (NumberFormatException nfe) {
+                    log.error(
+                        "Property maxWait could not be parsed as integer."
+                    );
+                }
+            }
 
             // The BasicDataSource has lazy initialization
             // borrowing a connection will start the DataSource

http://dive4elements.wald.intevation.org