Repository: stratos Updated Branches: refs/heads/docker-grouping-merge de74e1d6d -> 5d9905fa7
fixing a merge issue in ApplicationBuilder Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/5d9905fa Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/5d9905fa Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/5d9905fa Branch: refs/heads/docker-grouping-merge Commit: 5d9905fa72d9543cf0a65b6b100395ace257386e Parents: de74e1d Author: Isuru Haththotuwa <[email protected]> Authored: Tue Nov 4 17:44:05 2014 +0530 Committer: Isuru Haththotuwa <[email protected]> Committed: Tue Nov 4 17:44:47 2014 +0530 ---------------------------------------------------------------------- .../autoscaler/applications/topic/ApplicationBuilder.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/5d9905fa/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 d5fc50c..3571ad5 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 @@ -63,12 +63,10 @@ public class ApplicationBuilder { ApplicationHolder.acquireWriteLock(); try { Applications applications = ApplicationHolder.getApplications(); - if (applications.getApplication(application.getUniqueIdentifier()) != null) { + if (applications.getApplication(application.getUniqueIdentifier()) == null) { CloudControllerClient.getInstance().createApplicationClusters(application.getUniqueIdentifier(), appClusterContexts); ApplicationHolder.persistApplication(application); - CloudControllerClient.getInstance().createApplicationClusters(application.getUniqueIdentifier(), - appClusterContexts); } else { log.warn("Application [ " + application.getUniqueIdentifier() + " ] already exists in Applications"); }
