0003131: null pointer when a table reload request is queued up and there

is no sym_node_security row
JumpMind · May 31, 2017 · cf772e2 · cf772e2
1 parent f30508f
commit cf772e2
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/RouterService.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/RouterService.java
@@ -329,15 +329,17 @@ public void processTableRequestLoads(Node source, ProcessInfo processInfo) {
                else {
                    NodeSecurity targetNodeSecurity = engine.getNodeService().findNodeSecurity(load.getTargetNodeId());
 
-                   boolean registered = targetNodeSecurity.getRegistrationTime() != null 
-                   		|| targetNodeSecurity.getNodeId().equals(targetNodeSecurity.getCreatedAtNodeId());
+                   boolean registered = targetNodeSecurity != null  && (targetNodeSecurity.getRegistrationTime() != null 
+                   		|| targetNodeSecurity.getNodeId().equals(targetNodeSecurity.getCreatedAtNodeId()));
                    if (registered) {  
                        // Make loads unique to the target and create time
                        String key = load.getTargetNodeId() + "::" + load.getCreateTime().toString();
                        if (!requestsSplitByLoad.containsKey(key)) {
                            requestsSplitByLoad.put(key, new ArrayList<TableReloadRequest>());
                        }
                        requestsSplitByLoad.get(key).add(load);
+                   } else {
+                       log.warn("There was a load queued up for '{}', but the node is not registered.  It is being ignored", load.getTargetNodeId());
                    }
                }
             }