Repository: stratos Updated Branches: refs/heads/master 48e1eb1a8 -> 140dbe57e
fixing a compilation issue Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/140dbe57 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/140dbe57 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/140dbe57 Branch: refs/heads/master Commit: 140dbe57ea807e22c0eb16a771c5382a328cb985 Parents: 48e1eb1 Author: Isuru Haththotuwa <[email protected]> Authored: Fri Nov 21 11:58:56 2014 +0530 Committer: Isuru Haththotuwa <[email protected]> Committed: Fri Nov 21 11:58:56 2014 +0530 ---------------------------------------------------------------------- .../domain/applications/ParentComponent.java | 16 +--------------- .../instance/context/ClusterInstanceContext.java | 3 +++ .../instance/context/GroupInstanceContext.java | 3 +++ 3 files changed, 7 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/140dbe57/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 1abdee5..8e18bad 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,8 +204,7 @@ public abstract class ParentComponent implements Serializable { } /** - * Adds InstanceContext of a child to the aliasAndInstanceIdToInstanceContextMap, - * after initializing the map if not already done. + * Adds InstanceContext of a child to the aliasAndInstanceIdToInstanceContextMap. * * @param alias alias of child * @param instanceId instance id of child @@ -213,14 +212,6 @@ public abstract class ParentComponent implements Serializable { */ public void addInstanceContext (String alias, String instanceId, InstanceContext instanceContext) { - if (aliasAndInstanceIdToInstanceContextMap == null) { - synchronized (this) { - if (aliasAndInstanceIdToInstanceContextMap == null) { - aliasAndInstanceIdToInstanceContextMap = new HashMap<AliasAndInstanceId, InstanceContext>(); - } - } - } - aliasAndInstanceIdToInstanceContextMap.put(new AliasAndInstanceId(alias, instanceId), instanceContext); } @@ -233,11 +224,6 @@ public abstract class ParentComponent implements Serializable { */ public InstanceContext getInstanceContext (String alias, String instanceId) { - // if the map is not initialized, return null - if (aliasAndInstanceIdToInstanceContextMap == null) { - return null; - } - return aliasAndInstanceIdToInstanceContextMap.get(new AliasAndInstanceId(alias, instanceId)); } http://git-wip-us.apache.org/repos/asf/stratos/blob/140dbe57/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/applications/scaling/instance/context/ClusterInstanceContext.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/applications/scaling/instance/context/ClusterInstanceContext.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/applications/scaling/instance/context/ClusterInstanceContext.java index e6a810d..8dca37a 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/applications/scaling/instance/context/ClusterInstanceContext.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/applications/scaling/instance/context/ClusterInstanceContext.java @@ -21,4 +21,7 @@ package org.apache.stratos.messaging.domain.applications.scaling.instance.contex public class ClusterInstanceContext extends InstanceContext { + public ClusterInstanceContext(String alias, String instanceId) { + super(alias, instanceId); + } } http://git-wip-us.apache.org/repos/asf/stratos/blob/140dbe57/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/applications/scaling/instance/context/GroupInstanceContext.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/applications/scaling/instance/context/GroupInstanceContext.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/applications/scaling/instance/context/GroupInstanceContext.java index 6d452d3..b567353 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/applications/scaling/instance/context/GroupInstanceContext.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/applications/scaling/instance/context/GroupInstanceContext.java @@ -21,4 +21,7 @@ package org.apache.stratos.messaging.domain.applications.scaling.instance.contex public class GroupInstanceContext extends InstanceContext { + public GroupInstanceContext(String alias, String instanceId) { + super(alias, instanceId); + } }
