Repository: stratos Updated Branches: refs/heads/master 68bf130a7 -> e14351e77
Validate App Policy against Application before handling application deployment Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/e14351e7 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/e14351e7 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/e14351e7 Branch: refs/heads/master Commit: e14351e77067d95b25acee5e816589a2640706ca Parents: 68bf130 Author: lasinducharith <[email protected]> Authored: Fri Jun 19 14:06:21 2015 +0530 Committer: lasinducharith <[email protected]> Committed: Fri Jun 19 14:06:21 2015 +0530 ---------------------------------------------------------------------- .../autoscaler/services/impl/AutoscalerServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/e14351e7/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/impl/AutoscalerServiceImpl.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/impl/AutoscalerServiceImpl.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/impl/AutoscalerServiceImpl.java index 4e324fc..c882f00 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/impl/AutoscalerServiceImpl.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/impl/AutoscalerServiceImpl.java @@ -273,13 +273,13 @@ public class AutoscalerServiceImpl implements AutoscalerService { throw new RuntimeException("Application context not found: " + applicationId); } + // validating application policy against the application + AutoscalerUtil.validateApplicationPolicyAgainstApplication(applicationId, applicationPolicyId); + // Create application clusters in cloud controller and send application created event ApplicationBuilder.handleApplicationDeployment(application, applicationContext.getComponents().getApplicationClusterContexts()); - // validating application policy against the application - AutoscalerUtil.validateApplicationPolicyAgainstApplication(applicationId, applicationPolicyId); - // Setting application policy id in application object try { ApplicationHolder.acquireWriteLock();
