apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use parameter dcId as wrapper to prevent NPE (#8986)

Browse Source
This commit is contained in:
dahn 2024-05-01 09:12:36 +02:00 committed by GitHub
parent aad410ae6c
commit e520525fe7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/EndPointSelector.java
View File

@ -47,5 +47,5 @@ public interface EndPointSelector {
EndPoint select(DataStore store, String downloadUrl); EndPoint select(DataStore store, String downloadUrl);
EndPoint findSsvm(long dcId); EndPoint findSsvm(Long dcId);
} }

3
engine/storage/src/main/java/org/apache/cloudstack/storage/endpoint/DefaultEndPointSelector.java
View File

@ -338,7 +338,8 @@ public class DefaultEndPointSelector implements EndPointSelector {
* Finds an SSVM that can be used to execute a command. * Finds an SSVM that can be used to execute a command.
* For zone-wide image store, use SSVM for that zone. For region-wide store, we can arbitrarily pick one SSVM to do the task. * For zone-wide image store, use SSVM for that zone. For region-wide store, we can arbitrarily pick one SSVM to do the task.
* */ * */
public EndPoint findSsvm(long dcId) { @Override
public EndPoint findSsvm(Long dcId) {
List<HostVO> ssAHosts = listUpAndConnectingSecondaryStorageVmHost(dcId); List<HostVO> ssAHosts = listUpAndConnectingSecondaryStorageVmHost(dcId);
if (ssAHosts == null || ssAHosts.isEmpty()) { if (ssAHosts == null || ssAHosts.isEmpty()) {
return null; return null;