From 5691cae80def4f92078cc82da81fd1e6ae6cfb79 Mon Sep 17 00:00:00 2001
From: chenson42 <chenson42@gmail.com>
Date: Wed, 21 Mar 2012 20:03:31 +0000
Subject: [PATCH] don't run query if node id is null.

---
 .../symmetric/service/impl/ConfigurationService.java       | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/ConfigurationService.java b/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/ConfigurationService.java
index aa41989d99..1b0a4b3037 100644
--- a/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/ConfigurationService.java
+++ b/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/ConfigurationService.java
@@ -248,6 +248,8 @@ public List<NodeChannel> getNodeChannels(final String nodeId, boolean refreshExt
                         nodeChannelCache = new HashMap<String, List<NodeChannel>>();
                         nodeChannelCacheTime = System.currentTimeMillis();
                     }
+                    
+                    if (nodeId != null) {
                     nodeChannels = sqlTemplate.query(getSql("selectNodeChannelsSql"),
                             new ISqlRowMapper<NodeChannel>() {
                                 public NodeChannel mapRow(Row row) {
@@ -277,9 +279,12 @@ public NodeChannel mapRow(Row row) {
                                     nodeChannel.setDataLoaderType(row.getString("data_loader_type"));
                                     return nodeChannel;
                                 };
-                            }, nodeId);
+                            }, nodeId);                    
                     nodeChannelCache.put(nodeId, nodeChannels);
                     loaded = true;
+                    } else {
+                        nodeChannels = new ArrayList<NodeChannel>(0);
+                    }
                 }
             }
         }