You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ga...@apache.org on 2015/12/08 16:17:57 UTC
[14/50] [abbrv] stratos git commit: Fixing line spaces added
Fixing line spaces added
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/7cf63b3c
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/7cf63b3c
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/7cf63b3c
Branch: refs/heads/master
Commit: 7cf63b3cf392dc26cb0ec281658e7962b0cdb2b9
Parents: 6aa4ab0
Author: Pubudu Gunatilaka <pu...@gmail.com>
Authored: Mon Nov 30 13:49:10 2015 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Mon Nov 30 13:54:52 2015 +0530
----------------------------------------------------------------------
.../cloud/controller/messaging/topology/TopologyBuilder.java | 1 -
.../apache/stratos/rest/endpoint/api/StratosApiV41Utils.java | 6 ++----
2 files changed, 2 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/7cf63b3c/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/topology/TopologyBuilder.java
----------------------------------------------------------------------
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 @@ public class TopologyBuilder {
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);
http://git-wip-us.apache.org/repos/asf/stratos/blob/7cf63b3c/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java
----------------------------------------------------------------------
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 @@ public class StratosApiV41Utils {
if (group.getCartridges() != null) {
if (group.getDeploymentPolicy() != null) {
groupParentHasDeploymentPolicy = true;
- } else {
- groupParentHasDeploymentPolicy = false;
}
validateCartridgesForDeploymentPolicy(group.getCartridges(), groupParentHasDeploymentPolicy);
}
@@ -1610,9 +1608,9 @@ public class StratosApiV41Utils {
* @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 " +