Repository: stratos
Updated Branches:
  refs/heads/docker-grouping-merge 38ea793fc -> 2bdf647e3


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/2bdf647e
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/2bdf647e
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/2bdf647e

Branch: refs/heads/docker-grouping-merge
Commit: 2bdf647e3572d0f6fe140631fe41ddd3e653147a
Parents: 38ea793
Author: reka <[email protected]>
Authored: Wed Nov 5 11:31:36 2014 +0530
Committer: reka <[email protected]>
Committed: Wed Nov 5 11:31:36 2014 +0530

----------------------------------------------------------------------
 .../cloud/controller/impl/CloudControllerServiceImpl.java   | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/stratos/blob/2bdf647e/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java
----------------------------------------------------------------------
diff --git 
a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java
 
b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java
index 461b449..b271ac5 100644
--- 
a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java
+++ 
b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java
@@ -1937,6 +1937,10 @@ public class CloudControllerServiceImpl implements 
CloudControllerService {
             }
             clusters.add(newCluster);
         }
+        TopologyBuilder.handleApplicationClustersCreated(appId, clusters);
+
+        persist();
+
     }
 
 //    public void deployApplicationDefinition (ApplicationContext 
applicationContext) throws ApplicationDefinitionException {
@@ -1951,10 +1955,7 @@ public class CloudControllerServiceImpl implements 
CloudControllerService {
 //                    applicationClusterContext.getHostName(), 
applicationClusterContext.isLbCluster()));
 //        }
 //
-//        /*TopologyBuilder.handleApplicationDeployed(application, 
applicationParser.getApplicationClusterContexts(),
-//                applicationParser.getPayloadData());
-//*/
-//        persist();
+//
 //    }
 //
 //    @Override

Reply via email to