You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ra...@apache.org on 2015/03/03 15:03:14 UTC
stratos git commit: more validation on deployment policy parsing
Repository: stratos
Updated Branches:
refs/heads/master 06676bfa4 -> 3dced9ae4
more validation on deployment policy parsing
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/3dced9ae
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/3dced9ae
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/3dced9ae
Branch: refs/heads/master
Commit: 3dced9ae431982382ca9cd9bea8dd68d84f880b9
Parents: 06676bf
Author: R-Rajkumar <rr...@gmail.com>
Authored: Tue Mar 3 19:33:01 2015 +0530
Committer: R-Rajkumar <rr...@gmail.com>
Committed: Tue Mar 3 19:33:01 2015 +0530
----------------------------------------------------------------------
.../stratos/autoscaler/util/AutoscalerUtil.java | 24 +++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/3dced9ae/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 779764a..3851778 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
@@ -417,7 +417,16 @@ public class AutoscalerUtil {
*/
private static List<String> getDeploymentPolicyIdsReferedInApplication(String applicationId) {
- Map<String, String> aliasToDeploymentPolicyIdMap = ApplicationHolder.getApplications().getApplication(applicationId).getAliasToDeploymentPolicyIdMap();
+ if (applicationId == null || StringUtils.isBlank(applicationId)) {
+ return null;
+ }
+
+ Application application = ApplicationHolder.getApplications().getApplication(applicationId);
+ if (application == null) {
+ return null;
+ }
+
+ Map<String, String> aliasToDeploymentPolicyIdMap = application.getAliasToDeploymentPolicyIdMap();
if (aliasToDeploymentPolicyIdMap == null) {
return null;
}
@@ -441,11 +450,20 @@ public class AutoscalerUtil {
*/
public static String getDeploymentPolicyIdByAlias(String applicationId, String alias) {
- if (alias == null || alias.isEmpty()) {
+ if (alias == null || StringUtils.isBlank(alias)) {
+ return null;
+ }
+
+ if (applicationId == null || StringUtils.isBlank(applicationId)) {
+ return null;
+ }
+
+ Application application = ApplicationHolder.getApplications().getApplication(applicationId);
+ if (application == null) {
return null;
}
- Map<String, String> aliasToDeploymentPolicyIdMap = ApplicationHolder.getApplications().getApplication(applicationId).getAliasToDeploymentPolicyIdMap();
+ Map<String, String> aliasToDeploymentPolicyIdMap = application.getAliasToDeploymentPolicyIdMap();
if (aliasToDeploymentPolicyIdMap == null) {
return null;