From 192d29c6b87ee7f53be90664d4fe8ce7010ca2f3 Mon Sep 17 00:00:00 2001
From: chenson42 <chenson42@gmail.com>
Date: Thu, 25 Apr 2013 17:55:26 +0000
Subject: [PATCH] give an option to not record error if node identity is not
 found

---
 .../org/jumpmind/symmetric/service/INodeService.java     | 2 ++
 .../org/jumpmind/symmetric/service/impl/NodeService.java | 9 ++++++++-
 .../jumpmind/symmetric/service/impl/MockNodeService.java | 4 ++++
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/service/INodeService.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/service/INodeService.java
index 5a3c4f1df9..47e59a74c5 100644
--- a/symmetric-core/src/main/java/org/jumpmind/symmetric/service/INodeService.java
+++ b/symmetric-core/src/main/java/org/jumpmind/symmetric/service/INodeService.java
@@ -96,6 +96,8 @@ public void ignoreNodeChannelForExternalId(boolean ignore, String channelId,
 
     public Node findIdentity(boolean useCache);
     
+    public Node findIdentity(boolean useCache, boolean logSqlError);
+    
     public Node getCachedIdentity();
 
     public boolean deleteIdentity();
diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/NodeService.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/NodeService.java
index d450b5a1b7..3508f42048 100644
--- a/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/NodeService.java
+++ b/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/NodeService.java
@@ -364,13 +364,20 @@ public Node findIdentity() {
     }
 
     public Node findIdentity(boolean useCache) {
+        return findIdentity(useCache, true);        
+    }
+    
+    public Node findIdentity(boolean useCache, boolean logSqlError) {
         if (cachedNodeIdentity == null || useCache == false) {
             try {
                 List<Node> list = sqlTemplate.query(
                         getSql("selectNodePrefixSql", "findNodeIdentitySql"), new NodeRowMapper());
                 cachedNodeIdentity = (Node) getFirstEntry(list);
             } catch (SqlException ex) {
-                log.warn("Failed to load the node identity because: {}.  Returning {}", ex.getMessage(), cachedNodeIdentity);
+                if (logSqlError) {
+                    log.info("Failed to load the node identity because: {}.  Returning {}",
+                            ex.getMessage(), cachedNodeIdentity);
+                }
             }
         }
         return cachedNodeIdentity;
diff --git a/symmetric-core/src/test/java/org/jumpmind/symmetric/service/impl/MockNodeService.java b/symmetric-core/src/test/java/org/jumpmind/symmetric/service/impl/MockNodeService.java
index b3354c9bda..f5c2792243 100644
--- a/symmetric-core/src/test/java/org/jumpmind/symmetric/service/impl/MockNodeService.java
+++ b/symmetric-core/src/test/java/org/jumpmind/symmetric/service/impl/MockNodeService.java
@@ -258,5 +258,9 @@ public boolean setReverseInitialLoadEnabled(String nodeId, boolean initialLoadEn
     public List<NodeSecurity> findNodeSecurityWithLoadEnabled() {
         return null;
     }
+    
+    public Node findIdentity(boolean useCache, boolean logSqlError) {
+        return null;
+    }
     
 }
\ No newline at end of file