Repository: stratos Updated Branches: refs/heads/master 7533adbc4 -> 9c0ee56c8
Fixing STRATOS-852 - LB cartridge treated as a service cartridge Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/9c0ee56c Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/9c0ee56c Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/9c0ee56c Branch: refs/heads/master Commit: 9c0ee56c82481f45cd87b3c6dee046d16896cc0b Parents: 7533adb Author: Akila Perera <[email protected]> Authored: Wed Oct 1 02:44:00 2014 +0530 Committer: Akila Perera <[email protected]> Committed: Wed Oct 1 02:44:00 2014 +0530 ---------------------------------------------------------------------- .../manager/manager/CartridgeSubscriptionManager.java | 2 +- .../subscription/filter/LBCreationSubscriptionFilter.java | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/9c0ee56c/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 2a419aa..539c983 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 @@ -132,7 +132,7 @@ public class CartridgeSubscriptionManager { } // add properties returned by filters - if (propertiesReturnedByFilters != null && propertiesReturnedByFilters.getProperties() != null && propertiesReturnedByFilters.getProperties().length > 0) { + if (propertiesReturnedByFilters.getProperties() != null && propertiesReturnedByFilters.getProperties().length > 0) { for (Property prop : propertiesReturnedByFilters.getProperties()) { serviceCartridgeSubscriptionProperties.addProperties(prop); http://git-wip-us.apache.org/repos/asf/stratos/blob/9c0ee56c/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/filter/LBCreationSubscriptionFilter.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/filter/LBCreationSubscriptionFilter.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/filter/LBCreationSubscriptionFilter.java index 4156d84..ca93935 100644 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/filter/LBCreationSubscriptionFilter.java +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/filter/LBCreationSubscriptionFilter.java @@ -18,6 +18,7 @@ */ package org.apache.stratos.manager.subscription.filter; +import java.util.List; import java.util.Random; import org.apache.commons.logging.Log; @@ -66,6 +67,7 @@ public class LBCreationSubscriptionFilter implements SubscriptionFilter { LBDataContext lbDataCtxt = null; CartridgeSubscription lbCartridgeSubscription = null; Properties lbCartridgeSubscriptionProperties = new Properties(); + Properties filterProperties = new Properties(); try { // get lb config reference @@ -92,6 +94,11 @@ public class LBCreationSubscriptionFilter implements SubscriptionFilter { lbCartridgeSubscription = subscribeToLB(subscriptionData, lbDataCtxt, cartridgeInfo); + if (lbDataCtxt.getLbProperperties() != null && !lbDataCtxt.getLbProperperties().isEmpty()) { + List<Property> lbProperperties = lbDataCtxt.getLbProperperties(); + lbCartridgeSubscriptionProperties.setProperties(lbProperperties.toArray(new Property[lbProperperties.size()])); + } + if (lbCartridgeSubscription != null) { // determine the LB cluster id, if available Property lbClusterIdProp = new Property(); @@ -100,6 +107,7 @@ public class LBCreationSubscriptionFilter implements SubscriptionFilter { .getClusterDomain()); lbCartridgeSubscriptionProperties .addProperties(lbClusterIdProp); + filterProperties.addProperties(lbClusterIdProp); // register LB cartridge subscription if (log.isDebugEnabled()) { @@ -116,7 +124,7 @@ public class LBCreationSubscriptionFilter implements SubscriptionFilter { throw new ADCException(e.getMessage(), e); } - return lbCartridgeSubscriptionProperties; + return filterProperties; } private CartridgeSubscription subscribeToLB (SubscriptionData subscriptionData, LBDataContext lbDataContext,
