From 1dc9f48e3d92f5d70ec8ba5067ff88952367550a Mon Sep 17 00:00:00 2001
From: Eric Long <elong@jumpmind.com>
Date: Wed, 16 Sep 2020 10:54:37 -0400
Subject: [PATCH] 0004550: Initial load time empty at client

---
 .../java/org/jumpmind/symmetric/model/NodeSecurity.java  | 2 +-
 .../symmetric/service/impl/InitialLoadService.java       | 9 ++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/model/NodeSecurity.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/model/NodeSecurity.java
index b89013922d..05cf18c583 100644
--- a/symmetric-core/src/main/java/org/jumpmind/symmetric/model/NodeSecurity.java
+++ b/symmetric-core/src/main/java/org/jumpmind/symmetric/model/NodeSecurity.java
@@ -130,7 +130,7 @@ public void setCreatedAtNodeId(String createdByNodeId) {
     }
     
     public boolean hasRegistered() {
-        return this.registrationTime  != null;
+        return this.registrationEnabled == false && this.registrationTime != null;
     }
     
     public boolean hasInitialLoaded() {
diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/InitialLoadService.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/InitialLoadService.java
index 80d4680f6d..0e0c0a32b9 100644
--- a/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/InitialLoadService.java
+++ b/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/InitialLoadService.java
@@ -89,8 +89,7 @@ public synchronized void queueLoads(boolean force) {
                     } else {
                         boolean isClusteringEnabled = parameterService.is(ParameterConstants.CLUSTER_LOCKING_ENABLED);
                         NodeSecurity identitySecurity = engine.getNodeService().findNodeSecurity(identity.getNodeId(), !isClusteringEnabled);
-                        isRegistered = identitySecurity != null && !identitySecurity.isRegistrationEnabled()
-                                && identitySecurity.getRegistrationTime() != null;
+                        isRegistered = identitySecurity != null && identitySecurity.hasRegistered();
                     }
 
                     if (isRegistered) {
@@ -158,7 +157,7 @@ public void processInitialLoadEnabledFlag(Node identity, ProcessInfo processInfo
                         boolean thisMySecurityRecord = security.getNodeId().equals(identity.getNodeId());
                         boolean reverseLoadEnabled = security.isRevInitialLoadEnabled();
                         boolean initialLoadEnabled = security.isInitialLoadEnabled();
-                        boolean registered = security.getRegistrationTime() != null;
+                        boolean registered = security.hasRegistered();
                         if (! thisMySecurityRecord && registered && reverseLoadEnabled && (reverseLoadFirst || !initialLoadEnabled)) {
                             // If node is created by me then set up reverse initial load
                             if(StringUtils.equals(security.getCreatedAtNodeId(), identity.getNodeId())) {
@@ -281,7 +280,7 @@ protected void processTableRequestLoads(Node source, ProcessInfo processInfo) {
                     } else {
                         NodeSecurity targetNodeSecurity = engine.getNodeService().findNodeSecurity(load.getTargetNodeId());
 
-                        boolean registered = targetNodeSecurity != null && (targetNodeSecurity.getRegistrationTime() != null
+                        boolean registered = targetNodeSecurity != null && (targetNodeSecurity.hasRegistered()
                                 || targetNodeSecurity.getNodeId().equals(targetNodeSecurity.getCreatedAtNodeId()));
                         if (registered) {
                             // Make loads unique to the target and create time
@@ -388,7 +387,7 @@ protected boolean isValidLoadTarget(String targetNodeId) {
         NodeSecurity targetNodeSecurity = engine.getNodeService().findNodeSecurity(targetNodeId);
 
         boolean reverseLoadFirst = parameterService.is(ParameterConstants.INITIAL_LOAD_REVERSE_FIRST);
-        boolean registered = targetNodeSecurity.getRegistrationTime() != null;
+        boolean registered = targetNodeSecurity.hasRegistered();
         boolean reverseLoadQueued = targetNodeSecurity.isRevInitialLoadEnabled();
 
         if (registered && (!reverseLoadFirst || !reverseLoadQueued)) {