From 338745c87b78a2ecffae51995c94a3a33688237e Mon Sep 17 00:00:00 2001
From: elong <elong@jumpmind.com>
Date: Fri, 1 Jul 2016 21:06:41 -0400
Subject: [PATCH] 0002665: Reduce number of times parameters are reread during
 startup

---
 .../org/jumpmind/symmetric/AbstractSymmetricEngine.java     | 3 +--
 .../symmetric/service/impl/AbstractParameterService.java    | 6 ++++--
 2 files changed, 5 insertions(+), 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
index a23ac06532..86112605cb 100644
--- 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/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/AbstractParameterService.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/AbstractParameterService.java
index f61d57640b..e42c7ee690 100644
--- a/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/AbstractParameterService.java
+++ b/symmetric-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);