0001524: When applying a SQL event, support multiple SQL statements. …

…Support additional replacement tokens.
JumpMind · Jan 13, 2014 · 84d2113 · 84d2113
1 parent 62dd9ce
commit 84d2113
Showing 1 changed file with 13 additions and 8 deletions.
diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/DataLoaderService.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/DataLoaderService.java
@@ -374,14 +374,19 @@ protected List<IncomingBatch> loadDataFromTransport(final ProcessInfo processInf
         Throwable error = null;
         try {
             Node targetNode = nodeService.findIdentity();
-            ctx.put(Constants.DATA_CONTEXT_TARGET_NODE, targetNode);
-            ctx.put(Constants.DATA_CONTEXT_TARGET_NODE_ID, targetNode.getNodeId());
-            ctx.put(Constants.DATA_CONTEXT_TARGET_NODE_GROUP_ID, targetNode.getNodeGroupId());
-            ctx.put(Constants.DATA_CONTEXT_TARGET_NODE_EXTERNAL_ID, targetNode.getExternalId());
-            ctx.put(Constants.DATA_CONTEXT_SOURCE_NODE, sourceNode);
-            ctx.put(Constants.DATA_CONTEXT_SOURCE_NODE_ID, sourceNode.getNodeId());
-            ctx.put(Constants.DATA_CONTEXT_SOURCE_NODE_GROUP_ID, sourceNode.getNodeGroupId());
-            ctx.put(Constants.DATA_CONTEXT_SOURCE_NODE_EXTERNAL_ID, sourceNode.getExternalId());
+            if (targetNode != null) {
+                ctx.put(Constants.DATA_CONTEXT_TARGET_NODE, targetNode);
+                ctx.put(Constants.DATA_CONTEXT_TARGET_NODE_ID, targetNode.getNodeId());
+                ctx.put(Constants.DATA_CONTEXT_TARGET_NODE_GROUP_ID, targetNode.getNodeGroupId());
+                ctx.put(Constants.DATA_CONTEXT_TARGET_NODE_EXTERNAL_ID, targetNode.getExternalId());
+            }
+
+            if (sourceNode != null) {
+                ctx.put(Constants.DATA_CONTEXT_SOURCE_NODE, sourceNode);
+                ctx.put(Constants.DATA_CONTEXT_SOURCE_NODE_ID, sourceNode.getNodeId());
+                ctx.put(Constants.DATA_CONTEXT_SOURCE_NODE_GROUP_ID, sourceNode.getNodeGroupId());
+                ctx.put(Constants.DATA_CONTEXT_SOURCE_NODE_EXTERNAL_ID, sourceNode.getExternalId());
+            }
 
             for (ILoadSyncLifecycleListener l : syncLifecycleListeners) {
                 l.syncStarted(ctx);