fixing NPE when an application is not there
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/33aac2e6 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/33aac2e6 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/33aac2e6 Branch: refs/heads/master Commit: 33aac2e64409e58d19f0ce5e35a17fa083ff198b Parents: 729ef7a Author: reka <[email protected]> Authored: Fri Jun 26 17:16:52 2015 +0530 Committer: reka <[email protected]> Committed: Tue Jun 30 11:23:49 2015 +0530 ---------------------------------------------------------------------- .../rest/endpoint/api/StratosApiV41Utils.java | 25 +++++++++++--------- 1 file changed, 14 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/33aac2e6/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 ad4a208..3ce9554 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 @@ -1910,18 +1910,21 @@ public class StratosApiV41Utils { try { ApplicationManager.acquireReadLockForApplication(applicationId); - Application application = ApplicationManager.getApplications().getApplication(applicationId); - if (application.getInstanceContextCount() > 0 - || (applicationContext != null && - applicationContext.getStatus().equals("Deployed"))) { + Application application = ApplicationManager.getApplications(). + getApplication(applicationId); + if(application != null) { + 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); + if (application == null) { + return null; + } + applicationBean = ObjectConverter.convertApplicationToApplicationInstanceBean(application); + for (ApplicationInstanceBean instanceBean : applicationBean.getApplicationInstances()) { + addClustersInstancesToApplicationInstanceBean(instanceBean, application); + addGroupsInstancesToApplicationInstanceBean(instanceBean, application); + } } } } finally {
