adding instance data holder to PolicyManager.
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/7065a675 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/7065a675 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/7065a675 Branch: refs/heads/master Commit: 7065a6752d7f23293846a41272a272af13a19f72 Parents: d9827db Author: Udara Liyanage <[email protected]> Authored: Fri Dec 20 16:42:32 2013 -0500 Committer: Udara Liyanage <[email protected]> Committed: Fri Dec 20 16:42:32 2013 -0500 ---------------------------------------------------------------------- .../autoscaler/policy/PolicyManager.java | 21 +++++++------------- 1 file changed, 7 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/7065a675/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/policy/PolicyManager.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/policy/PolicyManager.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/policy/PolicyManager.java index c939974..f0f4e57 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/policy/PolicyManager.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/policy/PolicyManager.java @@ -43,26 +43,19 @@ public class PolicyManager { private static final Log log = LogFactory.getLog(PolicyManager.class); - private static final String asResourcePath = AutoScalerConstants.AUTOSCALER_RESOURCE + AutoScalerConstants.AS_POLICY_RESOURCE + "/"; - private static Map<String, AutoscalePolicy> autoscalePolicyListMap = new HashMap<String, AutoscalePolicy>(); private static Map<String, DeploymentPolicy> deploymentPolicyListMap = new HashMap<String, DeploymentPolicy>(); - - private static PolicyManager instance = null; - - private PolicyManager() { + + private static class InstanceHolder { + private static final PolicyManager INSTANCE = new PolicyManager(); } public static PolicyManager getInstance() { - if (instance == null) { - synchronized (PolicyManager.class) { - if (instance == null) { - instance = new PolicyManager(); - } - } - } - return instance; + return InstanceHolder.INSTANCE; + } + + private PolicyManager() { } // Add the policy to information model and persist.
