Repository: incubator-stratos Updated Branches: refs/heads/master e89b1a6e3 -> e046af8af
handling a possible NPE Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/e046af8a Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/e046af8a Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/e046af8a Branch: refs/heads/master Commit: e046af8af6d7de735faea27c116d2b0c3ac2654c Parents: e89b1a6 Author: Isuru <[email protected]> Authored: Wed Apr 9 17:02:27 2014 +0530 Committer: Isuru <[email protected]> Committed: Wed Apr 9 17:02:27 2014 +0530 ---------------------------------------------------------------------- .../stratos/manager/manager/CartridgeSubscriptionManager.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/e046af8a/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 742d383..e7058f5 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 @@ -249,7 +249,9 @@ public class CartridgeSubscriptionManager { lbDataContext.getDeploymentPolicy(), repository); // add LB category to the payload - cartridgeSubscription.getPayloadData().add(CartridgeConstants.LB_CATEGORY, lbDataContext.getLbCategory()); + if (cartridgeSubscription.getPayloadData() != null) { + cartridgeSubscription.getPayloadData().add(CartridgeConstants.LB_CATEGORY, lbDataContext.getLbCategory()); + } // publishing to bam CartridgeSubscriptionDataPublisher.publish(subscriptionData.getTenantId(), @@ -331,7 +333,7 @@ public class CartridgeSubscriptionManager { // Add whether the subscription is enabled upstream git commits if(cartridgeSubscription.getPayloadData() != null) { - cartridgeSubscription.getPayloadData().add(CartridgeConstants.COMMIT_ENABLED, String.valueOf(subscriptionData.isCommitsEnabled())); + cartridgeSubscription.getPayloadData().add(CartridgeConstants.COMMIT_ENABLED, String.valueOf(subscriptionData.isCommitsEnabled())); }
