You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by la...@apache.org on 2015/06/03 18:51:52 UTC
stratos git commit: Fix build test failure
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 <la...@apache.org>
Authored: Wed Jun 3 22:21:34 2015 +0530
Committer: Lahiru Sandaruwan <la...@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()) {