adding application instances validation before displaying the runtime
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/7bc7b4dd Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/7bc7b4dd Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/7bc7b4dd Branch: refs/heads/master Commit: 7bc7b4dd44760fe46fd42c4ea638bf14d4456959 Parents: 1a7ea1a Author: reka <[email protected]> Authored: Tue Jun 23 18:57:45 2015 +0530 Committer: reka <[email protected]> Committed: Tue Jun 23 18:57:45 2015 +0530 ---------------------------------------------------------------------- .../rest/endpoint/api/StratosApiV41Utils.java | 26 +++++++++++--------- 1 file changed, 15 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/7bc7b4dd/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java index ea24d09..890cecb 100644 --- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java +++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java @@ -1895,22 +1895,26 @@ public class StratosApiV41Utils { } - if(applicationContext != null && applicationContext.getStatus().equals("Deployed")) { - try { - ApplicationManager.acquireReadLockForApplication(applicationId); - Application application = ApplicationManager.getApplications().getApplication(applicationId); + try { + ApplicationManager.acquireReadLockForApplication(applicationId); + Application application = ApplicationManager.getApplications().getApplication(applicationId); + if (application.getInstanceContextCount() > 0 + || (applicationContext != null && + applicationContext.getStatus().equals("Deployed"))) { + if (application == null) { return null; } - applicationBean = ObjectConverter.convertApplicationToApplicationInstanceBean(application); - for (ApplicationInstanceBean instanceBean : applicationBean.getApplicationInstances()) { - addClustersInstancesToApplicationInstanceBean(instanceBean, application); - addGroupsInstancesToApplicationInstanceBean(instanceBean, application); - } - } finally { - ApplicationManager.releaseReadLockForApplication(applicationId); } + applicationBean = ObjectConverter.convertApplicationToApplicationInstanceBean(application); + for (ApplicationInstanceBean instanceBean : applicationBean.getApplicationInstances()) { + addClustersInstancesToApplicationInstanceBean(instanceBean, application); + addGroupsInstancesToApplicationInstanceBean(instanceBean, application); + } + } finally { + ApplicationManager.releaseReadLockForApplication(applicationId); } + return applicationBean; }
