if we can't select the node identity, it isn't the end of the world. …

…shouldn't get an error here anyways.
JumpMind · Nov 5, 2012 · a280f7f · a280f7f
1 parent 1bdfd8d
commit a280f7f
Showing 1 changed file with 7 additions and 3 deletions.
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
@@ -336,9 +336,13 @@ public Node findIdentity() {
 
     public Node findIdentity(boolean useCache) {
         if (cachedNodeIdentity == null || useCache == false) {
-            List<Node> list = sqlTemplate.query(
-                    getSql("selectNodePrefixSql", "findNodeIdentitySql"), new NodeRowMapper());
-            cachedNodeIdentity = (Node) getFirstEntry(list);
+            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);
+            }
         }
         return cachedNodeIdentity;
     }