Skip to content

Commit 090bc56

Browse files
ustcweizhouweizhouapache
authored andcommitted
apache#4141: return empty list if config is null
1 parent 68a0422 commit 090bc56

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

api/src/main/java/com/cloud/agent/api/to/LoadBalancerTO.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -185,8 +185,9 @@ public LoadBalancerConfigTO[] getLbConfigs() {
185185
}
186186

187187
public void setLbConfigs(List<? extends LoadBalancerConfig> lbConfigs) {
188-
if (lbConfigs == null) {
189-
lbConfigs = new ArrayList<LoadBalancerConfig>();
188+
if (lbConfigs == null || lbConfigs.size() == 0) {
189+
this.lbConfigs = new LoadBalancerConfigTO[0];
190+
return;
190191
}
191192
this.lbConfigs = new LoadBalancerConfigTO[lbConfigs.size()];
192193
int i = 0;

core/src/main/java/com/cloud/agent/api/routing/LoadBalancerConfigCommand.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525

2626
import org.apache.cloudstack.network.lb.LoadBalancerConfig;
2727

28-
import java.util.ArrayList;
2928
import java.util.List;
3029

3130
/**
@@ -88,8 +87,9 @@ public LoadBalancerConfigTO[] getNetworkLbConfigs() {
8887
}
8988

9089
public void setNetworkLbConfigs(List<? extends LoadBalancerConfig> networkLbConfigs) {
91-
if (networkLbConfigs == null) {
92-
networkLbConfigs = new ArrayList<LoadBalancerConfig>();
90+
if (networkLbConfigs == null || networkLbConfigs.size() == 0) {
91+
this.networkLbConfigs = new LoadBalancerConfigTO[0];
92+
return;
9393
}
9494
this.networkLbConfigs = new LoadBalancerConfigTO[networkLbConfigs.size()];
9595
int i = 0;

0 commit comments

Comments
 (0)