[KARAF-2262] - cellar-cloud: The IP is not enough, sometimes the IP is hidden but a valid dns name is available
git-svn-id: https://svn.apache.org/repos/asf/karaf/cellar/branches/cellar-2.2.x@1466357 13f79535-47bb-0310-9956-ffa450edef68 Project: http://git-wip-us.apache.org/repos/asf/karaf-cellar/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf-cellar/commit/2b8feb3b Tree: http://git-wip-us.apache.org/repos/asf/karaf-cellar/tree/2b8feb3b Diff: http://git-wip-us.apache.org/repos/asf/karaf-cellar/diff/2b8feb3b Branch: refs/heads/cellar-2.2.x Commit: 2b8feb3b88948c0803e03c1f9cce34df45de08b0 Parents: 5d7ab3a Author: anierbeck <anierbeck@13f79535-47bb-0310-9956-ffa450edef68> Authored: Wed Apr 10 07:21:33 2013 +0000 Committer: anierbeck <anierbeck@13f79535-47bb-0310-9956-ffa450edef68> Committed: Wed Apr 10 07:21:33 2013 +0000 ---------------------------------------------------------------------- .../org/apache/karaf/cellar/core/discovery/DiscoveryTask.java | 3 +++ .../org/apache/karaf/cellar/hazelcast/HazelcastGroupManager.java | 2 ++ 2 files changed, 5 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/2b8feb3b/core/src/main/java/org/apache/karaf/cellar/core/discovery/DiscoveryTask.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/karaf/cellar/core/discovery/DiscoveryTask.java b/core/src/main/java/org/apache/karaf/cellar/core/discovery/DiscoveryTask.java index e6086d1..a940326 100644 --- a/core/src/main/java/org/apache/karaf/cellar/core/discovery/DiscoveryTask.java +++ b/core/src/main/java/org/apache/karaf/cellar/core/discovery/DiscoveryTask.java @@ -14,6 +14,7 @@ package org.apache.karaf.cellar.core.discovery; import java.io.IOException; +import java.util.Collections; import java.util.Dictionary; import java.util.Iterator; import java.util.LinkedHashSet; @@ -52,11 +53,13 @@ public class DiscoveryTask implements Runnable { if (configurationAdmin != null) { Set<String> members = new LinkedHashSet<String>(); + //TODO: some sort of timing should be included here ... if (discoveryServices != null && !discoveryServices.isEmpty()) { for (DiscoveryService service : discoveryServices) { service.refresh(); Set<String> discovered = service.discoverMembers(); members.addAll(discovered); + LOGGER.debug("CELLAR DISCOVERY: Service {} found members {}", service, discovered); } try { Configuration configuration = configurationAdmin.getConfiguration(Discovery.PID); http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/2b8feb3b/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/HazelcastGroupManager.java ---------------------------------------------------------------------- diff --git a/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/HazelcastGroupManager.java b/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/HazelcastGroupManager.java index 09ed7dd..b042297 100644 --- a/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/HazelcastGroupManager.java +++ b/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/HazelcastGroupManager.java @@ -511,6 +511,8 @@ public class HazelcastGroupManager implements GroupManager, EntryListener, Confi * @return */ protected Set<String> convertStringToSet(String string) { + if (string == null) + return Collections.EMPTY_SET; Set<String> result = new HashSet<String>(); String[] groupNames = string.split(",");
