diff --git a/symmetric-client/src/main/java/org/jumpmind/symmetric/job/RefreshCacheJob.java b/symmetric-client/src/main/java/org/jumpmind/symmetric/job/RefreshCacheJob.java index f793ef48fc..1027f21dc9 100644 --- a/symmetric-client/src/main/java/org/jumpmind/symmetric/job/RefreshCacheJob.java +++ b/symmetric-client/src/main/java/org/jumpmind/symmetric/job/RefreshCacheJob.java @@ -36,7 +36,6 @@ public RefreshCacheJob(ISymmetricEngine engine, ThreadPoolTaskScheduler taskSche @Override public void doJob(boolean force) throws Exception { - engine.getNodeService().refreshFromDatabase(); engine.getParameterService().refreshFromDatabase(); engine.getTriggerRouterService().refreshFromDatabase(); engine.getGroupletService().refreshFromDatabase(); 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 521c237de3..76a4485cf0 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 @@ -187,6 +187,4 @@ public void ignoreNodeChannelForExternalId(boolean ignore, String channelId, public NetworkedNode getRootNetworkedNode(); - public boolean refreshFromDatabase(); - } \ No newline at end of file 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 da73ceaf9a..be53405a35 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 @@ -66,8 +66,6 @@ public class NodeService extends AbstractService implements INodeService { private Node cachedNodeIdentity; - private AtomicReference> cachedNodeList = new AtomicReference>(null); - private Map securityCache; private long securityCacheTime; @@ -244,7 +242,6 @@ public void deleteNodeSecurity(String nodeId) { } public void deleteNode(String nodeId, boolean syncChange) { - clearCache(); ISqlTransaction transaction = null; try { transaction = sqlTemplate.startSqlTransaction(); @@ -317,7 +314,6 @@ public void insertNodeGroup(String groupId, String description) { } public void save(Node node) { - clearCache(); if (!updateNode(node)) { sqlTemplate.update( getSql("insertNodeSql"), @@ -335,7 +331,6 @@ public void save(Node node) { } public boolean updateNode(Node node) { - clearCache(); boolean updated = sqlTemplate.update( getSql("updateNodeSql"), new Object[] { node.getNodeGroupId(), node.getExternalId(), node.getDatabaseType(), @@ -460,25 +455,9 @@ public List findAllExternalIds() { } public List findAllNodes() { - List nodeList = cachedNodeList.get(); - if (nodeList != null) { - return nodeList; - } else { - nodeList = sqlTemplate.query(getSql("selectNodePrefixSql"), new NodeRowMapper()); - cachedNodeList.set(nodeList); - } + List nodeList = sqlTemplate.query(getSql("selectNodePrefixSql"), new NodeRowMapper()); return nodeList; } - - public void clearCache() { - cachedNodeList.set(null); - } - - public boolean refreshFromDatabase() { - clearCache(); - findAllNodes(); - return true; - } public Map findAllNodesAsMap() { List nodes = findAllNodes(); diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/RegistrationService.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/RegistrationService.java index 8eaef20c5b..c6be3ab98d 100644 --- a/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/RegistrationService.java +++ b/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/RegistrationService.java @@ -480,7 +480,6 @@ public void registerWithServer() { * @see IRegistrationService#reOpenRegistration(String) */ public synchronized void reOpenRegistration(String nodeId) { - nodeService.refreshFromDatabase(); Node node = nodeService.findNode(nodeId); NodeSecurity security = nodeService.findNodeSecurity(nodeId); String password = null; 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 023ae96fa1..bbe6ae0194 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 @@ -296,9 +296,4 @@ public String getExternalId(String nodeId) { return nodeId; } - @Override - public boolean refreshFromDatabase() { - return false; - } - } \ No newline at end of file