0002691: Partial initial loads

JumpMind · Aug 2, 2016 · e8d74d0 · e8d74d0
1 parent 14cccbe
commit e8d74d0
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/DataService.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/DataService.java
@@ -776,8 +776,11 @@ private void insertLoadBatchesForReload(Node targetNode, long loadId, String cre
                 if (triggerRouter.getInitialLoadOrder() >= 0
                         && engine.getGroupletService().isTargetEnabled(triggerRouter, targetNode)) {
 
-                    TableReloadRequest reloadRequest = reloadRequests.get(triggerRouter.getTriggerId() + triggerRouter.getRouterId());
-                    String selectSql = reloadRequest != null ? reloadRequest.getReloadSelect() : null;
+                    String selectSql = null;
+                    if (reloadRequests != null) {
+                        TableReloadRequest reloadRequest = reloadRequests.get(triggerRouter.getTriggerId() + triggerRouter.getRouterId());
+                        selectSql = reloadRequest != null ? reloadRequest.getReloadSelect() : null;
+                    }
                     if (StringUtils.isBlank(selectSql)) {
                         selectSql = StringUtils.isBlank(triggerRouter.getInitialLoadSelect()) 
                                     ? Constants.ALWAYS_TRUE_CONDITION