svn commit: r1327539 - in /karaf/cellar/trunk: hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/ shell/src/main/java/org/apache/karaf/cellar/shell/group/

[jbonofre]

Author: jbonofre
Date: Wed Apr 18 15:12:31 2012
New Revision: 1327539

URL: http://svn.apache.org/viewvc?rev=1327539&view=rev
Log:
[KARAF-1236] Update the groups member during group manager destroy

Modified:
    
karaf/cellar/trunk/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/CellarMembershipListener.java
    
karaf/cellar/trunk/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/HazelcastGroupManager.java
    
karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupSupport.java

Modified: 
karaf/cellar/trunk/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/CellarMembershipListener.java
URL: 
http://svn.apache.org/viewvc/karaf/cellar/trunk/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/CellarMembershipListener.java?rev=1327539&r1=1327538&r2=1327539&view=diff
==============================================================================
--- 
karaf/cellar/trunk/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/CellarMembershipListener.java
 (original)
+++ 
karaf/cellar/trunk/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/CellarMembershipListener.java
 Wed Apr 18 15:12:31 2012
@@ -67,7 +67,7 @@ public class CellarMembershipListener ex
 
     @Override
     public void memberRemoved(MembershipEvent membershipEvent) {
-
+        // nothing to do
     }
 
     public GroupManager getGroupManager() {

Modified: 
karaf/cellar/trunk/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/HazelcastGroupManager.java
URL: 
http://svn.apache.org/viewvc/karaf/cellar/trunk/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/HazelcastGroupManager.java?rev=1327539&r1=1327538&r2=1327539&view=diff
==============================================================================
--- 
karaf/cellar/trunk/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/HazelcastGroupManager.java
 (original)
+++ 
karaf/cellar/trunk/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/HazelcastGroupManager.java
 Wed Apr 18 15:12:31 2012
@@ -102,6 +102,15 @@ public class HazelcastGroupManager imple
     }
 
     public void destroy() {
+        // update the group
+        Node local = this.getNode();
+        Set<Group> groups = this.listGroups(local);
+        for (Group group : groups) {
+            String groupName = group.getName();
+            group.getNodes().remove(local);
+            listGroups().put(groupName, group);
+        }
+        // shutdown the group consumer/producers
         for(Map.Entry<String,EventConsumer> 
consumerEntry:groupConsumer.entrySet()) {
             EventConsumer consumer = consumerEntry.getValue();
             consumer.stop();

Modified: 
karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupSupport.java
URL: 
http://svn.apache.org/viewvc/karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupSupport.java?rev=1327539&r1=1327538&r2=1327539&view=diff
==============================================================================
--- 
karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupSupport.java
 (original)
+++ 
karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupSupport.java
 Wed Apr 18 15:12:31 2012
@@ -63,12 +63,12 @@ public abstract class GroupSupport exten
                 if (result != null && result.getGroups() != null) {
                     for (Group g : result.getGroups()) {
                         if (g.getNodes() != null && !g.getNodes().isEmpty()) {
-                            for (Node memeber : g.getNodes()) {
+                            for (Node member : g.getNodes()) {
                                 String name = g.getName();
                                 String mark = " ";
-                                if (memeber.equals(clusterManager.getNode()))
+                                if (member.equals(clusterManager.getNode()))
                                     mark = "*";
-                                
System.out.println(String.format(OUTPUT_FORMAT, mark, memeber.getId(), name));
+                                
System.out.println(String.format(OUTPUT_FORMAT, mark, member.getId(), name));
                             }
                         } else System.out.println(String.format(OUTPUT_FORMAT, 
"", "", g.getName()));
                     }