Repository: stratos Updated Branches: refs/heads/docker-grouping-merge 43c995a23 -> cae0b997a
fixing merging issue Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/cae0b997 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/cae0b997 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/cae0b997 Branch: refs/heads/docker-grouping-merge Commit: cae0b997a63954930b76be0b8f5b63a7a81775a8 Parents: 43c995a Author: reka <[email protected]> Authored: Tue Nov 4 12:12:19 2014 +0530 Committer: reka <[email protected]> Committed: Tue Nov 4 12:12:19 2014 +0530 ---------------------------------------------------------------------- .../client/cloud/controller/CloudControllerClient.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/cae0b997/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/cloud/controller/CloudControllerClient.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/cloud/controller/CloudControllerClient.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/cloud/controller/CloudControllerClient.java index 4e30a49..4270669 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/cloud/controller/CloudControllerClient.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/cloud/controller/CloudControllerClient.java @@ -31,6 +31,7 @@ import org.apache.stratos.autoscaler.kubernetes.KubernetesManager; import org.apache.stratos.autoscaler.util.ConfUtil; import org.apache.stratos.cloud.controller.stub.*; import org.apache.stratos.cloud.controller.stub.deployment.partition.Partition; +import org.apache.stratos.cloud.controller.stub.pojo.ApplicationClusterContextDTO; import org.apache.stratos.cloud.controller.stub.pojo.CartridgeInfo; import org.apache.stratos.cloud.controller.stub.pojo.ContainerClusterContext; import org.apache.stratos.cloud.controller.stub.pojo.MemberContext; @@ -41,6 +42,8 @@ import org.apache.stratos.common.xsd.Properties; import org.apache.stratos.common.xsd.Property; import java.rmi.RemoteException; +import java.util.ArrayList; +import java.util.List; import java.util.Set; /** @@ -207,7 +210,7 @@ public class CloudControllerClient { public synchronized void createApplicationClusters(String appId, Set<ApplicationClusterContext> appClusterContexts) { - /*List<ApplicationClusterContextDTO> contextDTOs = + List<ApplicationClusterContextDTO> contextDTOs = new ArrayList<ApplicationClusterContextDTO>(); for(ApplicationClusterContext context : appClusterContexts) { ApplicationClusterContextDTO dto = new ApplicationClusterContextDTO(); @@ -235,7 +238,7 @@ public class CloudControllerClient { //e.printStackTrace(); String msg = e.getMessage(); log.error(msg, e); - }*/ + } }
