stratos-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lahi...@apache.org
Subject stratos git commit: Including network partiton id parameter independent of cep stat publisher is enabled or not
Date Wed, 03 Jun 2015 13:07:32 GMT
Repository: stratos
Updated Branches:
  refs/heads/master 2c4ec32ab -> cd97af02d


Including network partiton id parameter independent of cep stat publisher is enabled or not


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

Branch: refs/heads/master
Commit: cd97af02d8d9fd692108328844cd03f1b38a525a
Parents: 2c4ec32
Author: Lahiru Sandaruwan <lahirus@apache.org>
Authored: Wed Jun 3 18:37:19 2015 +0530
Committer: Lahiru Sandaruwan <lahirus@apache.org>
Committed: Wed Jun 3 18:37:19 2015 +0530

----------------------------------------------------------------------
 .../stratos/load/balancer/conf/LoadBalancerConfiguration.java | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/stratos/blob/cd97af02/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/conf/LoadBalancerConfiguration.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/conf/LoadBalancerConfiguration.java
b/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/conf/LoadBalancerConfiguration.java
index 87a9cb3..50b5546 100644
--- a/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/conf/LoadBalancerConfiguration.java
+++ b/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/conf/LoadBalancerConfiguration.java
@@ -382,6 +382,10 @@ public class LoadBalancerConfiguration {
                 if (StringUtils.isNotBlank(memberFilter)) {
                     configuration.setTopologyMemberFilter(memberFilter);
                 }
+
+                String networkPartitionId = loadBalancerNode.getProperty(Constants.CONF_PROPERTY_NETWORK_PARTITION_ID);
+                validateRequiredPropertyInNode(Constants.CONF_PROPERTY_NETWORK_PARTITION_ID,
networkPartitionId, "loadbalancer");
+                configuration.setNetworkPartitionId(networkPartitionId);
             }
 
             // Read cep ip and port if cep stats publisher is enabled
@@ -394,9 +398,6 @@ public class LoadBalancerConfiguration {
                 validateRequiredPropertyInNode(Constants.CONF_PROPERTY_CEP_PORT, cepPort,
"loadbalancer");
                 configuration.setCepPort(Integer.parseInt(cepPort));
 
-                String networkPartitionId = loadBalancerNode.getProperty(Constants.CONF_PROPERTY_NETWORK_PARTITION_ID);
-                validateRequiredPropertyInNode(Constants.CONF_PROPERTY_NETWORK_PARTITION_ID,
networkPartitionId, "loadbalancer");
-                configuration.setNetworkPartitionId(networkPartitionId);
             }
 
             if (configuration.isMultiTenancyEnabled()) {


Mime
View raw message