stratos-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lahi...@apache.org
Subject stratos git commit: Fix build test failure
Date Wed, 03 Jun 2015 16:51:52 GMT
Repository: stratos
Updated Branches:
  refs/heads/master cd97af02d -> 4829f0627


Fix build test failure


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

Branch: refs/heads/master
Commit: 4829f0627b20ece16c58ddcf159d8b8f2cbac11b
Parents: cd97af0
Author: Lahiru Sandaruwan <lahirus@apache.org>
Authored: Wed Jun 3 22:21:34 2015 +0530
Committer: Lahiru Sandaruwan <lahirus@apache.org>
Committed: Wed Jun 3 22:21:34 2015 +0530

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


http://git-wip-us.apache.org/repos/asf/stratos/blob/4829f062/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 50b5546..87a9cb3 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,10 +382,6 @@ 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
@@ -398,6 +394,9 @@ 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