Repository: incubator-stratos Updated Branches: refs/heads/master d87b9acba -> c0805cc12
fixing STRATOS-634 Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/c0805cc1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/c0805cc1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/c0805cc1 Branch: refs/heads/master Commit: c0805cc1247861b3d6213fb352909aa57abea821 Parents: d87b9ac Author: Isuru H <[email protected]> Authored: Tue Apr 29 17:49:11 2014 +0530 Committer: Isuru H <[email protected]> Committed: Tue Apr 29 17:49:11 2014 +0530 ---------------------------------------------------------------------- .../manager/deploy/service/ServiceDeploymentManager.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/c0805cc1/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/ServiceDeploymentManager.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/ServiceDeploymentManager.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/ServiceDeploymentManager.java index 2c3045e..0909a77 100644 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/ServiceDeploymentManager.java +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/ServiceDeploymentManager.java @@ -319,9 +319,11 @@ public class ServiceDeploymentManager { Service service = new MultiTenantService(type, autoscalingPolicyName, deploymentPolicyName, tenantId, cartridgeInfo, tenantRange); Properties serviceClusterProperties = null; - if (lbDataCtxt.getLoadBalancedServiceProperties() != null && !lbDataCtxt.getLoadBalancedServiceProperties().isEmpty()) { - serviceClusterProperties = new Properties(); - serviceClusterProperties.setProperties(lbDataCtxt.getLoadBalancedServiceProperties().toArray(new Property[0])); + if (lbDataCtxt != null) { + if (lbDataCtxt.getLoadBalancedServiceProperties() != null && !lbDataCtxt.getLoadBalancedServiceProperties().isEmpty()) { + serviceClusterProperties = new Properties(); + serviceClusterProperties.setProperties(lbDataCtxt.getLoadBalancedServiceProperties().toArray(new Property[0])); + } } // create
