You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by is...@apache.org on 2014/11/03 08:50:03 UTC

git commit: fixing a compilation failure

Repository: stratos
Updated Branches:
  refs/heads/4.0.0-grouping c6febda9a -> 5b5948898


fixing a compilation failure


Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/5b594889
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/5b594889
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/5b594889

Branch: refs/heads/4.0.0-grouping
Commit: 5b594889878f139dceb2df7755cc9614599e62db
Parents: c6febda
Author: Isuru Haththotuwa <is...@apache.org>
Authored: Mon Nov 3 13:19:46 2014 +0530
Committer: Isuru Haththotuwa <is...@apache.org>
Committed: Mon Nov 3 13:19:46 2014 +0530

----------------------------------------------------------------------
 .../autoscaler/applications/topic/ApplicationBuilder.java    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/stratos/blob/5b594889/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/topic/ApplicationBuilder.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/topic/ApplicationBuilder.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/topic/ApplicationBuilder.java
index f9a38a1..b14e13c 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/topic/ApplicationBuilder.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/topic/ApplicationBuilder.java
@@ -167,15 +167,15 @@ public class ApplicationBuilder {
     public static synchronized void handleApplicationCreated (Application application,
                                                               Set<ApplicationClusterContext> appClusterContexts) {
 
-        Applications applications = ApplicationHolder.getApplications();
-
         ApplicationHolder.acquireWriteLock();
 
+        Applications applications = ApplicationHolder.getApplications();
+
         try {
             if (applications.getApplication(application.getUniqueIdentifier()) != null) {
+                CloudControllerClient.getInstance().createApplicationClusters(application.getUniqueIdentifier(),
+                        appClusterContexts);
                 ApplicationHolder.persistApplication(application);
-                //TODO cloud controller client and register clusters
-                CloudControllerClient.getInstance().createApplicationClusters();
                // startApplicationMonitor(application.getUniqueIdentifier());
             } else {
                 log.warn("Application [ " + application.getUniqueIdentifier() + " ] already exists in Applications");