Repository: stratos
Updated Branches:
  refs/heads/stratos-4.1.x 7811f123c -> 1bc4f53f4


Fixing Cluster.addLoadBalancerIps() method logic


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

Branch: refs/heads/stratos-4.1.x
Commit: 1bc4f53f4e60a17736d433e7a2b0593251bdcde2
Parents: 7811f12
Author: Imesh Gunaratne <[email protected]>
Authored: Wed Oct 14 12:52:44 2015 +0530
Committer: Imesh Gunaratne <[email protected]>
Committed: Wed Oct 14 12:52:44 2015 +0530

----------------------------------------------------------------------
 .../apache/stratos/messaging/domain/topology/Cluster.java    | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/stratos/blob/1bc4f53f/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Cluster.java
----------------------------------------------------------------------
diff --git 
a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Cluster.java
 
b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Cluster.java
index 4668d97..1808cfd 100644
--- 
a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Cluster.java
+++ 
b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Cluster.java
@@ -377,7 +377,13 @@ public class Cluster implements Serializable {
     }
 
     public void addLoadBalancerIps(List<String> loadBalancerIps) {
-        loadBalancerIps.addAll(loadBalancerIps);
+        if(loadBalancerIps == null) {
+            return;
+        }
+        if(this.loadBalancerIps == null) {
+            this.loadBalancerIps = new ArrayList<String>();
+        }
+        this.loadBalancerIps.addAll(loadBalancerIps);
     }
 
     @Override

Reply via email to