Only generate DB config for Derby if no serverName specified

Signed-off-by: Scott Kurz <skurz@us.ibm.com>
MicroShed · Sep 13, 2019 · 211b280 · 211b280
1 parent 89324a0
commit 211b280
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/boost-common/src/main/java/boost/common/boosters/JDBCBoosterConfig.java b/boost-common/src/main/java/boost/common/boosters/JDBCBoosterConfig.java
@@ -122,11 +122,14 @@ public Properties getDatasourceProperties() {
 
         // Verify correct property configuration
         if (dependency.contains(DERBY_GROUP_ID)) {
-            if (!datasourceProperties.containsKey(BoostProperties.DATASOURCE_DATABASE_NAME)) {
+            // If there's no DB name and there's no server name then we can create an embedded DB at a default location
+            if ((!datasourceProperties.containsKey(BoostProperties.DATASOURCE_DATABASE_NAME)) &&
+                (!datasourceProperties.containsKey(BoostProperties.DATASOURCE_SERVER_NAME))) {
                 datasourceProperties.put(BoostProperties.DATASOURCE_DATABASE_NAME, DERBY_DB);
-            }
-            if (!datasourceProperties.containsKey(BoostProperties.DATASOURCE_CREATE_DATABASE)) {
-                datasourceProperties.put(BoostProperties.DATASOURCE_CREATE_DATABASE, "create");
+                // I guess if someone already specified something honor it, but we want to auto-create our default location DB
+                if (!datasourceProperties.containsKey(BoostProperties.DATASOURCE_CREATE_DATABASE)) {
+                    datasourceProperties.put(BoostProperties.DATASOURCE_CREATE_DATABASE, "create");
+                }
             }
         } else {
             // Check connection properties