Skip to content

Commit 8f58fad

Browse files
committed
Merge branch 'fix/ZSTAC-80789' into '5.5.12'
<fix>[storage]: ZSTAC-80789 return defensive copy from getPreferBackupStorageTypes See merge request zstackio/zstack!9433
2 parents 06621e2 + d9f0d4d commit 8f58fad

3 files changed

Lines changed: 6 additions & 3 deletions

File tree

plugin/expon/src/main/java/org/zstack/expon/ExponStorageFactory.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import org.zstack.header.volume.VolumeInventory;
99
import org.zstack.header.volume.VolumeProtocol;
1010

11+
import java.util.ArrayList;
1112
import java.util.LinkedHashMap;
1213
import java.util.List;
1314
import java.util.Map;
@@ -48,7 +49,7 @@ public String getIdentity() {
4849

4950
@Override
5051
public List<String> getPreferBackupStorageTypes() {
51-
return preferBackupStorageTypes;
52+
return new ArrayList<>(preferBackupStorageTypes);
5253
}
5354

5455
public void setPreferBackupStorageTypes(List<String> preferBackupStorageTypes) {

plugin/xinfini/src/main/java/org/zstack/xinfini/XInfiniStorageFactory.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import org.zstack.header.xinfini.XInfiniConstants;
1212
import org.zstack.storage.addon.primary.ExternalPrimaryStorageFactory;
1313

14+
import java.util.ArrayList;
1415
import java.util.LinkedHashMap;
1516
import java.util.List;
1617

@@ -55,7 +56,7 @@ public String getIdentity() {
5556

5657
@Override
5758
public List<String> getPreferBackupStorageTypes() {
58-
return preferBackupStorageTypes;
59+
return new ArrayList<>(preferBackupStorageTypes);
5960
}
6061

6162
public void setPreferBackupStorageTypes(List<String> preferBackupStorageTypes) {

plugin/zbs/src/main/java/org/zstack/storage/zbs/ZbsStorageFactory.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import org.zstack.utils.ssh.Ssh;
1212
import org.zstack.utils.ssh.SshResult;
1313

14+
import java.util.ArrayList;
1415
import java.util.List;
1516

1617
import static org.zstack.core.Platform.operr;
@@ -93,7 +94,7 @@ public void setPreferBackupStorageTypes(List<String> preferBackupStorageTypes) {
9394

9495
@Override
9596
public List<String> getPreferBackupStorageTypes() {
96-
return preferBackupStorageTypes;
97+
return new ArrayList<>(preferBackupStorageTypes);
9798
}
9899

99100
@Override

0 commit comments

Comments
 (0)