Update aliasToDeploymentPolicyIdMap to handle null values
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/2abd651f Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/2abd651f Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/2abd651f Branch: refs/heads/tenant-isolation Commit: 2abd651f1c70ce116a50aecc892682258f498c3d Parents: 18f9fde Author: Gayan Gunarathne <[email protected]> Authored: Tue Jul 14 19:32:44 2015 +0530 Committer: Gayan Gunarathne <[email protected]> Committed: Tue Jul 14 19:32:44 2015 +0530 ---------------------------------------------------------------------- .../java/org/apache/stratos/autoscaler/util/AutoscalerUtil.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/2abd651f/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/AutoscalerUtil.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/AutoscalerUtil.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/AutoscalerUtil.java index 5f0d60c..81113a6 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/AutoscalerUtil.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/AutoscalerUtil.java @@ -442,7 +442,7 @@ public class AutoscalerUtil { List<String> deploymentPolicyIds = new ArrayList<String>(); for (Map.Entry<String, String> entry : aliasToDeploymentPolicyIdMap.entrySet()) { - if (!deploymentPolicyIds.contains(entry.getValue())) { + if (!deploymentPolicyIds.contains(entry.getValue())&& entry.getValue()!=null) { deploymentPolicyIds.add(entry.getValue()); } } @@ -735,8 +735,7 @@ public class AutoscalerUtil { public static void validateApplicationPolicyAgainstApplication(String applicationUuid, String applicationPolicyUuid) throws ApplicatioinPolicyNotExistsException, InvalidApplicationPolicyException { - ApplicationPolicy applicationPolicy = PolicyManager.getInstance().getApplicationPolicyByUuid - (applicationPolicyUuid); + ApplicationPolicy applicationPolicy = PolicyManager.getInstance().getApplicationPolicyByUuid(applicationPolicyUuid); if (applicationPolicy == null) { String msg = String.format("Application Policy not exists for [application-policy-id] %s", applicationPolicyUuid); log.error(msg);
