Repository: stratos Updated Branches: refs/heads/master b00e58387 -> 6278c7a0b
adding instance id to topology Member Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/6278c7a0 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/6278c7a0 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/6278c7a0 Branch: refs/heads/master Commit: 6278c7a0b88e5ebf1893b353fe2f77bcd4b95ca2 Parents: b00e583 Author: Isuru Haththotuwa <[email protected]> Authored: Fri Nov 21 11:48:16 2014 +0530 Committer: Isuru Haththotuwa <[email protected]> Committed: Fri Nov 21 11:48:16 2014 +0530 ---------------------------------------------------------------------- .../messaging/domain/applications/ParentComponent.java | 3 ++- .../apache/stratos/messaging/domain/topology/Member.java | 9 +++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/6278c7a0/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/applications/ParentComponent.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/applications/ParentComponent.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/applications/ParentComponent.java index 664ffa5..1abdee5 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/applications/ParentComponent.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/applications/ParentComponent.java @@ -204,7 +204,8 @@ public abstract class ParentComponent implements Serializable { } /** - * Adds InstanceContext of a child to the aliasAndInstanceIdToInstanceContextMap. + * Adds InstanceContext of a child to the aliasAndInstanceIdToInstanceContextMap, + * after initializing the map if not already done. * * @param alias alias of child * @param instanceId instance id of child http://git-wip-us.apache.org/repos/asf/stratos/blob/6278c7a0/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Member.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Member.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Member.java index 80af632..3269746 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Member.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Member.java @@ -51,6 +51,8 @@ public class Member implements Serializable, LifeCycleStateTransitionBehavior<Me @XmlJavaTypeAdapter(MapAdapter.class) private Properties properties; private String lbClusterId; + // instance id to use if snapshot wise group scaling is enabled + private String instanceId; private LifeCycleStateManager<MemberStatus> memberStateManager; public Member(String serviceName, String clusterId, String networkPartitionId, String partitionId, String memberId, long initTime) { @@ -181,5 +183,12 @@ public class Member implements Serializable, LifeCycleStateTransitionBehavior<Me + ", properties=" + properties + ", lbClusterId=" + lbClusterId + "]"; } + public String getInstanceId() { + return instanceId; + } + + public void setInstanceId(String instanceId) { + this.instanceId = instanceId; + } }
