0002665: Reduce number of times parameters are reread during startup

JumpMind · Jul 2, 2016 · 338745c · 338745c
1 parent 709c2fc
commit 338745c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/AbstractSymmetricEngine.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/AbstractSymmetricEngine.java
@@ -409,7 +409,6 @@ public String getEngineName() {
     }
 
     public void setup() {
-        getParameterService().rereadParameters();
         if (!setup) {
             setupDatabase(false);
             parameterService.setDatabaseHasBeenInitialized(true);
@@ -428,7 +427,6 @@ public void setupDatabase(boolean force) {
         clusterService.init();
         sequenceService.init();
         autoConfigRegistrationServer();
-        parameterService.rereadParameters();
         log.info("Done initializing SymmetricDS database");
     }
 
@@ -438,6 +436,7 @@ protected void autoConfigRegistrationServer() {
         if (node == null) {
             buildTablesFromDdlUtilXmlIfProvided();
             loadFromScriptIfProvided();
+            parameterService.rereadParameters();
         }
 
         node = nodeService.findIdentity();

diff --git a/...tric-core/src/main/java/org/jumpmind/symmetric/service/impl/AbstractParameterService.java b/...tric-core/src/main/java/org/jumpmind/symmetric/service/impl/AbstractParameterService.java
@@ -204,8 +204,10 @@ public String getEngineName() {
     }
 
     public void setDatabaseHasBeenInitialized(boolean databaseHasBeenInitialized) {
-        this.databaseHasBeenInitialized = databaseHasBeenInitialized;
-        this.parameters = null;
+        if (this.databaseHasBeenInitialized != databaseHasBeenInitialized) {
+            this.databaseHasBeenInitialized = databaseHasBeenInitialized;
+            this.parameters = null;
+        }
     }
 
     abstract public TypedProperties getDatabaseParameters(String externalId, String nodeGroupId);