Repository: incubator-stratos
Updated Branches:
  refs/heads/master c45866344 -> a3c09483a


fixing a possible bug


Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/a3c09483
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/a3c09483
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/a3c09483

Branch: refs/heads/master
Commit: a3c09483a4f373e542ce424e03a61791be9fcd56
Parents: c458663
Author: Isuru <[email protected]>
Authored: Fri Mar 7 18:08:25 2014 +0530
Committer: Isuru <[email protected]>
Committed: Fri Mar 7 18:08:25 2014 +0530

----------------------------------------------------------------------
 .../stratos/manager/deploy/service/ServiceDeploymentManager.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/a3c09483/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 3ea0fc6..eebaaba 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
@@ -337,7 +337,7 @@ public class ServiceDeploymentManager {
 
     private void deployLBCluster (String loadBalancedService, LBDataContext 
lbDataCtxt, String tenantRange) throws ADCException, 
UnregisteredCartridgeException {
 
-        if (lbDataCtxt.getLbCategory().equals(Constants.NO_LOAD_BALANCER)) {
+        if (lbDataCtxt.getLbCategory() == null || 
lbDataCtxt.getLbCategory().equals(Constants.NO_LOAD_BALANCER)) {
             // no load balancer required
             return;
         }

Reply via email to