#4141: return empty list if config is null

ustcweizhou · ustcweizhou · commit 1ccff8298166 · 2020-11-11T09:40:06.000Z
diff --git a/api/src/main/java/com/cloud/agent/api/to/LoadBalancerTO.java b/api/src/main/java/com/cloud/agent/api/to/LoadBalancerTO.java
@@ -187,8 +187,9 @@ public LoadBalancerConfigTO[] getLbConfigs() {
     }
 
     public void setLbConfigs(List<? extends LoadBalancerConfig> lbConfigs) {
-        if (lbConfigs == null) {
-            lbConfigs = new ArrayList<LoadBalancerConfig>();
+        if (lbConfigs == null || lbConfigs.size() == 0) {
+            this.lbConfigs = new LoadBalancerConfigTO[0];
+            return;
         }
         this.lbConfigs = new LoadBalancerConfigTO[lbConfigs.size()];
         int i = 0;
diff --git a/core/src/main/java/com/cloud/agent/api/routing/LoadBalancerConfigCommand.java b/core/src/main/java/com/cloud/agent/api/routing/LoadBalancerConfigCommand.java
@@ -25,7 +25,6 @@
 
 import org.apache.cloudstack.network.lb.LoadBalancerConfig;
 
-import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -88,8 +87,9 @@ public LoadBalancerConfigTO[] getNetworkLbConfigs() {
     }
 
     public void setNetworkLbConfigs(List<? extends LoadBalancerConfig> networkLbConfigs) {
-        if (networkLbConfigs == null) {
-            networkLbConfigs = new ArrayList<LoadBalancerConfig>();
+        if (networkLbConfigs == null || networkLbConfigs.size() == 0) {
+            this.networkLbConfigs = new LoadBalancerConfigTO[0];
+            return;
         }
         this.networkLbConfigs = new LoadBalancerConfigTO[networkLbConfigs.size()];
         int i = 0;

Original file line number	Diff line number	Diff line change
`@@ -187,8 +187,9 @@ public LoadBalancerConfigTO[] getLbConfigs() {`
`187`	`187`	`}`
`188`	`188`
`189`	`189`	`public void setLbConfigs(List<? extends LoadBalancerConfig> lbConfigs) {`
`190`		`- if (lbConfigs == null) {`
`191`		`- lbConfigs = new ArrayList<LoadBalancerConfig>();`
	`190`	`+ if (lbConfigs == null \|\| lbConfigs.size() == 0) {`
	`191`	`+ this.lbConfigs = new LoadBalancerConfigTO[0];`
	`192`	`+ return;`
`192`	`193`	`}`
`193`	`194`	`this.lbConfigs = new LoadBalancerConfigTO[lbConfigs.size()];`
`194`	`195`	`int i = 0;`