SYMMETRICDS-104 - Allow blank external ids

JumpMind · May 30, 2009 · ea36409 · ea36409
1 parent 8ca0fbd
commit ea36409
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 3 deletions.
diff --git a/symmetric/src/main/java/org/jumpmind/symmetric/util/DefaultNodeIdGenerator.java b/symmetric/src/main/java/org/jumpmind/symmetric/util/DefaultNodeIdGenerator.java
@@ -42,7 +42,10 @@ public String selectNodeId(INodeService nodeService, Node node) {
                     return nodeId;
                 }
                 nodeId = buildNodeId(nodeService, node) + "-" + sequence;
-            }
+            } 
+
+            return nodeId;
+
         }
         return node.getNodeId();
     }
@@ -65,7 +68,7 @@ public String generateNodeId(INodeService nodeService, Node node) {
     }
 
     protected String buildNodeId(INodeService nodeService, Node node) {
-        return node.getExternalId();
+        return StringUtils.isBlank(node.getExternalId()) ? "0" : node.getExternalId();
     }
 
     public String generatePassword(INodeService nodeService, Node node) {

diff --git a/symmetric/src/test/java/org/jumpmind/symmetric/service/impl/RegistrationServiceTest.java b/symmetric/src/test/java/org/jumpmind/symmetric/service/impl/RegistrationServiceTest.java
@@ -109,11 +109,27 @@ public void testRegisterNode() throws Exception {
         assertEquals(security.isRegistrationEnabled(), false, "Wrong isRegistrationEnabled");
         assertNotSame(security.getRegistrationTime(), null, "Wrong registrationTime");
     }
+
+    @Test
+    public void testRegisterWithBlankExternalId() throws Exception {        
+        Node node = new Node();
+        node.setNodeGroupId(TestConstants.TEST_CLIENT_NODE_GROUP);
+        node.setExternalId(null);
+        node.setSyncURL("http://localhost:8080/sync");
+        node.setSchemaVersion("1");
+        node.setDatabaseType("MySQL");
+        node.setDatabaseVersion("5");
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+        assertFalse(registrationService.registerNode(node, out, true), "Node should not be allowed to register");
+        registrationService.openRegistration(TestConstants.TEST_CLIENT_NODE_GROUP, "0");
+        node.setExternalId(null);
+        node.setNodeId(null);
+        assertTrue(registrationService.registerNode(node, out, true), "Node should be allowed to register");
+    }
 
     @Test
     public void testRegisterNodeAutomatic() throws Exception {
         try {
-
             getParameterService().saveParameter(ParameterConstants.AUTO_REGISTER_ENABLED, true);
             doTestRegisterNodeAutomatic();
         } finally {