commit | 7cf63b3cf392dc26cb0ec281658e7962b0cdb2b9 | [log] [tgz] |
---|---|---|
author | Pubudu Gunatilaka <pubudu538@gmail.com> | Mon Nov 30 13:49:10 2015 +0530 |
committer | Imesh Gunaratne <imesh@apache.org> | Mon Nov 30 13:54:52 2015 +0530 |
tree | 3f4bd951d6ed902d445f5e456c876df6f8c1ab91 | |
parent | 6aa4ab012e0474940c8529745baba04d1b0c9120 [diff] |
Fixing line spaces added
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/topology/TopologyBuilder.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/topology/TopologyBuilder.java index 109cf30..6fe25f8 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/topology/TopologyBuilder.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/topology/TopologyBuilder.java
@@ -415,7 +415,6 @@ log.error("Invalid state transition from " + member.getStatus() + " to " + MemberStatus.Initialized); } else { - Cluster cluster = service.getCluster(memberContext.getClusterId()); String clusterId = cluster.getClusterId(); ClusterContext clusterContext = CloudControllerContext.getInstance().getClusterContext(clusterId);
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java index 87aff60..ffe2a24 100644 --- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java +++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java
@@ -1578,8 +1578,6 @@ if (group.getCartridges() != null) { if (group.getDeploymentPolicy() != null) { groupParentHasDeploymentPolicy = true; - } else { - groupParentHasDeploymentPolicy = false; } validateCartridgesForDeploymentPolicy(group.getCartridges(), groupParentHasDeploymentPolicy); } @@ -1610,9 +1608,9 @@ * @throws RestAPIException */ private static void validateCartridgesForDeploymentPolicy(List<CartridgeReferenceBean> cartridgeReferenceBeans, - boolean hasDeploymentPolicy) throws RestAPIException { + boolean groupParentHasDeploymentPolicy) throws RestAPIException { - if (hasDeploymentPolicy) { + if (groupParentHasDeploymentPolicy) { for (CartridgeReferenceBean cartridge : cartridgeReferenceBeans) { if (cartridge.getSubscribableInfo().getDeploymentPolicy() != null) { String message = "Group deployment policy already exists. Remove deployment policy from " +