for reverse initial load bug fix

JumpMind · Apr 23, 2012 · 85a522f · 85a522f
1 parent 47b25a2
commit 85a522f
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/AbstractSymmetricEngine.java b/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/AbstractSymmetricEngine.java
@@ -233,7 +233,7 @@ protected void init() {
                 incomingBatchService, configurationService, transportManager, statisticManager,
                 nodeService, transformService, triggerRouterService, stagingManager);
         this.registrationService = new RegistrationService(parameterService, symmetricDialect,
-                nodeService, dataExtractorService, dataService, dataLoaderService,
+                nodeService, dataExtractorService, triggerRouterService, dataService, dataLoaderService,
                 transportManager, statisticManager);
         this.acknowledgeService = new AcknowledgeService(parameterService, symmetricDialect,
                 outgoingBatchService, registrationService, stagingManager);

diff --git a/...symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/RegistrationService.java b/...symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/RegistrationService.java
@@ -43,13 +43,15 @@
 import org.jumpmind.symmetric.model.RegistrationRequest;
 import org.jumpmind.symmetric.model.RegistrationRequest.RegistrationStatus;
 import org.jumpmind.symmetric.model.RemoteNodeStatus.Status;
+import org.jumpmind.symmetric.model.TriggerRouter;
 import org.jumpmind.symmetric.security.INodePasswordFilter;
 import org.jumpmind.symmetric.service.IDataExtractorService;
 import org.jumpmind.symmetric.service.IDataLoaderService;
 import org.jumpmind.symmetric.service.IDataService;
 import org.jumpmind.symmetric.service.INodeService;
 import org.jumpmind.symmetric.service.IParameterService;
 import org.jumpmind.symmetric.service.IRegistrationService;
+import org.jumpmind.symmetric.service.ITriggerRouterService;
 import org.jumpmind.symmetric.service.RegistrationFailedException;
 import org.jumpmind.symmetric.service.RegistrationRedirectException;
 import org.jumpmind.symmetric.statistic.IStatisticManager;
@@ -76,14 +78,17 @@ public class RegistrationService extends AbstractService implements IRegistratio
     private INodePasswordFilter nodePasswordFilter;
 
     private IStatisticManager statisticManager;
+
+    private ITriggerRouterService triggerRouterService;
 
     public RegistrationService(IParameterService parameterService,
             ISymmetricDialect symmetricDialect, INodeService nodeService,
-            IDataExtractorService dataExtractorService, IDataService dataService,
+            IDataExtractorService dataExtractorService, ITriggerRouterService triggerRouterService, IDataService dataService,
             IDataLoaderService dataLoaderService, ITransportManager transportManager,
             IStatisticManager statisticManager) {
         super(parameterService, symmetricDialect);
         this.nodeService = nodeService;
+        this.triggerRouterService = triggerRouterService;
         this.dataExtractorService = dataExtractorService;
         this.dataService = dataService;
         this.dataLoaderService = dataLoaderService;
@@ -316,7 +321,12 @@ protected void sendInitialLoadFromRegisteredNode() {
             nodes.addAll(nodeService.findTargetNodesFor(NodeGroupLinkAction.W));            
             for (Node node : nodes) {
                 log.info("Enabling an initial load to {}", node.getNodeId());
-                nodeService.setInitialLoadEnabled(node.getNodeId(), true);
+                List<TriggerRouter> triggerRouters = new ArrayList<TriggerRouter>(triggerRouterService
+                        .getAllTriggerRoutersForReloadForCurrentNode(parameterService.getNodeGroupId(),
+                                node.getNodeGroupId()));
+                for (TriggerRouter trigger : triggerRouters) {
+                    dataService.insertReloadEvent(node, trigger);
+                }
                 queuedLoad = true;
             }