From 4cd60a3ac4bf4c0a39718b80377f1f3ce5fd2a06 Mon Sep 17 00:00:00 2001 From: chenson42 Date: Wed, 4 Mar 2015 18:13:18 +0000 Subject: [PATCH] 0002225: JMX method openRegistration should behave like the command line openRegistration command --- .../service/jmx/NodeManagementService.java | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/symmetric-client/src/main/java/org/jumpmind/symmetric/service/jmx/NodeManagementService.java b/symmetric-client/src/main/java/org/jumpmind/symmetric/service/jmx/NodeManagementService.java index 3643c8ea56..29c496499e 100644 --- a/symmetric-client/src/main/java/org/jumpmind/symmetric/service/jmx/NodeManagementService.java +++ b/symmetric-client/src/main/java/org/jumpmind/symmetric/service/jmx/NodeManagementService.java @@ -324,13 +324,16 @@ public void ignoreNodeChannelForExternalId(boolean ignore, String channelId, @ManagedOperationParameter(name = "nodeGroup", description = "The node group id this node will belong to"), @ManagedOperationParameter(name = "externalId", description = "The external id for the node") }) public void openRegistration(String nodeGroupId, String externalId) { - Node node = engine.getNodeService().findNodeByExternalId(nodeGroupId, externalId); - if (node != null) { - engine.getRegistrationService().reOpenRegistration(node.getExternalId()); - } else { - engine.getRegistrationService().openRegistration(nodeGroupId, externalId); - } + engine.getRegistrationService().openRegistration(nodeGroupId, externalId); } + + @ManagedOperation(description = "Re-open the registration for a node with the specified external id") + @ManagedOperationParameters({ + @ManagedOperationParameter(name = "nodeId", description = "The node id to reopen registration for")}) + public void reopenRegistration(String nodeId) { + engine.getRegistrationService().reOpenRegistration(nodeId); + } + @ManagedOperation(description = "Send an initial load of data to a node.") @ManagedOperationParameters({ @ManagedOperationParameter(name = "nodeId", description = "The node id to reload.") })