You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by sa...@apache.org on 2014/03/13 10:14:50 UTC
git commit: Applying patch given by Vimuth, for STRATOS-514
Repository: incubator-stratos
Updated Branches:
refs/heads/master add6e6d2f -> ab2c5a838
Applying patch given by Vimuth, for STRATOS-514
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/ab2c5a83
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/ab2c5a83
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/ab2c5a83
Branch: refs/heads/master
Commit: ab2c5a838c1f99f910fb6386951cf66123619d90
Parents: add6e6d
Author: Sajith Kariyawasam <sa...@wso2.com>
Authored: Thu Mar 13 14:44:28 2014 +0530
Committer: Sajith Kariyawasam <sa...@wso2.com>
Committed: Thu Mar 13 14:44:28 2014 +0530
----------------------------------------------------------------------
.../stratos/manager/manager/CartridgeSubscriptionManager.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ab2c5a83/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/manager/CartridgeSubscriptionManager.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/manager/CartridgeSubscriptionManager.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/manager/CartridgeSubscriptionManager.java
index 13dec9a..747d4a0 100644
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/manager/CartridgeSubscriptionManager.java
+++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/manager/CartridgeSubscriptionManager.java
@@ -134,7 +134,7 @@ public class CartridgeSubscriptionManager {
serviceCartridgeSubscriptionProperties = new Properties();
// lb related properties
- if (lbDataCtxt.getLoadBalancedServiceProperties() != null && !lbDataCtxt.getLoadBalancedServiceProperties().isEmpty()) {
+ if ((lbDataCtxt != null && lbDataCtxt.getLoadBalancedServiceProperties() != null) && !lbDataCtxt.getLoadBalancedServiceProperties().isEmpty()) {
serviceCartridgeSubscriptionProperties.setProperties(lbDataCtxt.getLoadBalancedServiceProperties().toArray(new Property[0]));
}