You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ud...@apache.org on 2014/11/12 17:43:46 UTC
[5/7] stratos git commit: fixing NPE when GET non existing group
fixing NPE when GET non existing group
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/a249362d
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/a249362d
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/a249362d
Branch: refs/heads/master
Commit: a249362d8d1a09caf40f5278091ea1baecc38a6a
Parents: fa667ff
Author: Udara Liyanage <ud...@wso2.com>
Authored: Wed Nov 12 21:55:37 2014 +0530
Committer: Udara Liyanage <ud...@wso2.com>
Committed: Wed Nov 12 22:13:06 2014 +0530
----------------------------------------------------------------------
.../grouping/deployer/DefaultServiceGroupDeployer.java | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/a249362d/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/grouping/deployer/DefaultServiceGroupDeployer.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/grouping/deployer/DefaultServiceGroupDeployer.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/grouping/deployer/DefaultServiceGroupDeployer.java
index 036c22e..b7d1572 100644
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/grouping/deployer/DefaultServiceGroupDeployer.java
+++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/grouping/deployer/DefaultServiceGroupDeployer.java
@@ -185,12 +185,15 @@ public class DefaultServiceGroupDeployer implements ServiceGroupDeployer {
asServiceClient = AutoscalerServiceClient.getServiceClient();
if (log.isDebugEnabled()) {
- log.debug("deploying to cloud controller service group " + serviceGroupDefinitionName);
+ log.debug(String.format("Calling AS to get service group %s", serviceGroupDefinitionName));
}
ServiceGroup serviceGroup = asServiceClient.getServiceGroup(serviceGroupDefinitionName);
- ServiceGroupDefinition serviceGroupDef = populateServiceGroupDefinitionPojo(serviceGroup);
+ if (serviceGroup == null) {
+ return null;
+ }
+ ServiceGroupDefinition serviceGroupDef = populateServiceGroupDefinitionPojo(serviceGroup);
return serviceGroupDef;
} catch (AxisFault axisFault) {