From 011ec2076550fe1eeb1c2fe0eccfb3d47600e23d Mon Sep 17 00:00:00 2001 From: chenson42 Date: Wed, 2 Jan 2013 19:26:16 +0000 Subject: [PATCH] fix null pointer exception while trying to open registration on an unconfigured node --- .../jumpmind/symmetric/service/impl/RegistrationService.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) 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 7d4c2761f4..84a4fe66fb 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 @@ -365,9 +365,7 @@ public synchronized String openRegistration(Node node) { protected String openRegistration(Node node, String remoteHost, String remoteAddress) { Node me = nodeService.findIdentity(); - if (me != null - || (parameterService.getExternalId().equals(node.getExternalId()) && parameterService - .getNodeGroupId().equals(node.getNodeGroupId()))) { + if (me != null) { String nodeId = nodeService.getNodeIdCreator().generateNodeId(node, remoteHost, remoteAddress); Node existingNode = nodeService.findNode(nodeId); if (existingNode == null) {