svn commit: r1466357 - in /karaf/cellar/branches/cellar-2.2.x: core/src/main/java/org/apache/karaf/cellar/core/discovery/DiscoveryTask.java hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/HazelcastGroupManager.java

[anierbeck]

Author: anierbeck
Date: Wed Apr 10 07:21:33 2013
New Revision: 1466357

URL: http://svn.apache.org/r1466357
Log:
[KARAF-2262] - cellar-cloud: The IP is not enough, sometimes the IP is hidden 
but a valid dns name is available

Modified:
    
karaf/cellar/branches/cellar-2.2.x/core/src/main/java/org/apache/karaf/cellar/core/discovery/DiscoveryTask.java
    
karaf/cellar/branches/cellar-2.2.x/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/HazelcastGroupManager.java

Modified: 
karaf/cellar/branches/cellar-2.2.x/core/src/main/java/org/apache/karaf/cellar/core/discovery/DiscoveryTask.java
URL: 
http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/core/src/main/java/org/apache/karaf/cellar/core/discovery/DiscoveryTask.java?rev=1466357&r1=1466356&r2=1466357&view=diff
==============================================================================
--- 
karaf/cellar/branches/cellar-2.2.x/core/src/main/java/org/apache/karaf/cellar/core/discovery/DiscoveryTask.java
 (original)
+++ 
karaf/cellar/branches/cellar-2.2.x/core/src/main/java/org/apache/karaf/cellar/core/discovery/DiscoveryTask.java
 Wed Apr 10 07:21:33 2013
@@ -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 Ru
 
         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);

Modified: 
karaf/cellar/branches/cellar-2.2.x/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/HazelcastGroupManager.java
URL: 
http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/HazelcastGroupManager.java?rev=1466357&r1=1466356&r2=1466357&view=diff
==============================================================================
--- 
karaf/cellar/branches/cellar-2.2.x/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/HazelcastGroupManager.java
 (original)
+++ 
karaf/cellar/branches/cellar-2.2.x/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/HazelcastGroupManager.java
 Wed Apr 10 07:21:33 2013
@@ -511,6 +511,8 @@ public class HazelcastGroupManager imple
      * @return
      */
     protected Set<String> convertStringToSet(String string) {
+       if (string == null)
+               return Collections.EMPTY_SET;
         Set<String> result = new HashSet<String>();
         String[] groupNames = string.split(",");