From 5cdfccc10a31bc62eb9b26f79eb35747d9336cf1 Mon Sep 17 00:00:00 2001
From: mmichalek <mmichalek@jumpmind.com>
Date: Wed, 22 Jun 2016 12:53:12 -0400
Subject: [PATCH] 0002646: FileRouting throws NPE when lookup router doesn't
 route

---
 .../org/jumpmind/symmetric/route/FileSyncDataRouter.java   | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/route/FileSyncDataRouter.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/route/FileSyncDataRouter.java
index 157560b385..acf92d0994 100644
--- a/symmetric-core/src/main/java/org/jumpmind/symmetric/route/FileSyncDataRouter.java
+++ b/symmetric-core/src/main/java/org/jumpmind/symmetric/route/FileSyncDataRouter.java
@@ -97,8 +97,11 @@ public Set<String> routeToNodes(SimpleRouterContext context, DataMetaData dataMe
                         ((ChannelRouterContext) context).addUsedDataRouter(dataRouter);
                     }
                     dataMetaData.setRouter(router);
-                    nodeIds.addAll(dataRouter.routeToNodes(context, dataMetaData, nodes, false,
-                            false, triggerRouter));
+                    Set<String> dataRouterNodeIds = dataRouter.routeToNodes(context, dataMetaData, nodes, false,
+                            false, triggerRouter); 
+                    if (dataRouterNodeIds != null) {                        
+                        nodeIds.addAll(dataRouterNodeIds);
+                    }
                     nodeIds.remove(sourceNodeId);
                 }
             }