0003194: SymmetricDS fails to start on multi-homed installations using

the exact same db.url
JumpMind · Jul 31, 2017 · 5ee6080 · 5ee6080
1 parent a33e02d
commit 5ee6080
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/symmetric-server/src/main/java/org/jumpmind/symmetric/web/SymmetricEngineHolder.java b/symmetric-server/src/main/java/org/jumpmind/symmetric/web/SymmetricEngineHolder.java
@@ -408,8 +408,14 @@ protected void validateEngineFiles(File[] files) {
                 try {
                     fileInputStream = new FileInputStream(file.getAbsolutePath());
                     properties.load(fileInputStream);                    
-                    String dbUrl = properties.getProperty(BasicDataSourcePropertyConstants.DB_POOL_URL, "");                    
-                    checkDuplicate(dbUrl, BasicDataSourcePropertyConstants.DB_POOL_URL, dbToPropertyFiles, file);
+                    final String userUrl = String.format("%s@%s", 
+                            properties.getProperty(BasicDataSourcePropertyConstants.DB_POOL_USER, ""), 
+                            properties.getProperty(BasicDataSourcePropertyConstants.DB_POOL_URL, ""));                    
+                    final String KEY = String.format("%s@%s", 
+                            BasicDataSourcePropertyConstants.DB_POOL_USER, 
+                            BasicDataSourcePropertyConstants.DB_POOL_URL);
+
+                    checkDuplicate(userUrl, KEY, dbToPropertyFiles, file);
                 } catch (Exception ex) {
                     if (ex instanceof SymmetricException) {
                         log.error("**** FATAL **** error " + ex.toString()); // Jetty logs the stack at WARN level.