Updated Branches:
  refs/heads/master b0632d439 -> 0c6acd1c8

fixing a possible bug


Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/0c6acd1c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/0c6acd1c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/0c6acd1c

Branch: refs/heads/master
Commit: 0c6acd1c847805417bf776c3820e3930b36325b7
Parents: b0632d4
Author: Isuru <[email protected]>
Authored: Sun Feb 9 00:15:51 2014 +0530
Committer: Isuru <[email protected]>
Committed: Sun Feb 9 00:15:51 2014 +0530

----------------------------------------------------------------------
 .../topology/receiver/StratosManagerTopologyReceiver.java | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/0c6acd1c/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/topology/receiver/StratosManagerTopologyReceiver.java
----------------------------------------------------------------------
diff --git 
a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/topology/receiver/StratosManagerTopologyReceiver.java
 
b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/topology/receiver/StratosManagerTopologyReceiver.java
index ff10a5c..5f6aea5 100644
--- 
a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/topology/receiver/StratosManagerTopologyReceiver.java
+++ 
b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/topology/receiver/StratosManagerTopologyReceiver.java
@@ -333,10 +333,12 @@ public class StratosManagerTopologyReceiver implements 
Runnable {
                                     
getService(cartridgeSubscription.getType()).getCluster(cartridgeSubscription.getClusterDomain());
 
                             // remove the terminated member from the cluster
-                            Member terminatedMember = 
cluster.getMember(memberTerminatedEvent.getMemberId());
-                            cluster.removeMember(terminatedMember);
-                            if (log.isDebugEnabled()) {
-                                log.debug("Removed the terminated member with 
id " + memberTerminatedEvent.getMemberId() + " from the cluster");
+                            if 
(cluster.memberExists(memberTerminatedEvent.getMemberId())) {
+                                Member terminatedMember = 
cluster.getMember(memberTerminatedEvent.getMemberId());
+                                cluster.removeMember(terminatedMember);
+                                if (log.isDebugEnabled()) {
+                                    log.debug("Removed the terminated member 
with id " + memberTerminatedEvent.getMemberId() + " from the cluster");
+                                }
                             }
 
                             
TopologyClusterInformationModel.getInstance().addCluster(cartridgeSubscription.getSubscriber().getTenantId(),

Reply via email to