Updated Branches:
  refs/heads/master 92b4b1e18 -> 6c0227d41

correcting a debug log


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

Branch: refs/heads/master
Commit: 6c0227d412edc9b23c74434c48d0984bb311776e
Parents: 92b4b1e
Author: Isuru <[email protected]>
Authored: Fri Feb 7 16:16:51 2014 +0530
Committer: Isuru <[email protected]>
Committed: Fri Feb 7 16:16:51 2014 +0530

----------------------------------------------------------------------
 .../model/TopologyClusterInformationModel.java  | 23 +++++++++++++++-----
 1 file changed, 17 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/6c0227d4/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/topology/model/TopologyClusterInformationModel.java
----------------------------------------------------------------------
diff --git 
a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/topology/model/TopologyClusterInformationModel.java
 
b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/topology/model/TopologyClusterInformationModel.java
index 546f6b2..b89a9d9 100644
--- 
a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/topology/model/TopologyClusterInformationModel.java
+++ 
b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/topology/model/TopologyClusterInformationModel.java
@@ -116,17 +116,28 @@ public class TopologyClusterInformationModel {
                         }
                     }*/
                     // remove the existing one
-                    subscriptionAliasContextSet.remove(new 
SubscriptionAliasContext(subscriptionAlias, null));
+                    boolean existingClusterRemoved = 
subscriptionAliasContextSet.remove(new 
SubscriptionAliasContext(subscriptionAlias, null));
 
                     //now, add the new cluster object
                     subscriptionAliasContextSet.add(new 
SubscriptionAliasContext(subscriptionAlias, cluster));
 
                     if (log.isDebugEnabled()) {
-                        log.debug("Existing cluster found, updated : " + 
cluster.toString());
-                        Collection<Member> members = cluster.getMembers();
-                        if (members != null && !members.isEmpty()) {
-                            for (Member member : members) {
-                                log.debug("[ " + member.getServiceName() + ", 
" + member.getClusterId() + ", "+ member.getMemberId()  + " ]");
+                        // check if cluster was overwritten
+                        if (existingClusterRemoved) {
+                            log.debug("Existing cluster found, updated : " + 
cluster.toString());
+                            Collection<Member> members = cluster.getMembers();
+                            if (members != null && !members.isEmpty()) {
+                                for (Member member : members) {
+                                    log.debug("[ " + member.getServiceName() + 
", " + member.getClusterId() + ", "+ member.getMemberId()  + " ]");
+                                }
+                            }
+                        } else {
+                            log.debug("New cluster added : " + 
cluster.toString());
+                            Collection<Member> members = cluster.getMembers();
+                            if (members != null && !members.isEmpty()) {
+                                for (Member member : members) {
+                                    log.debug("[ " + member.getServiceName() + 
", " + member.getClusterId() + ", "+ member.getMemberId()  + " ]");
+                                }
                             }
                         }
                     }

Reply via email to