(cloudstack) branch 4.19 updated: Use parameter dcId as wrapper to prevent NPE (#8986)

[dahn]

This is an automated email from the ASF dual-hosted git repository.

dahn pushed a commit to branch 4.19
in repository https://gitbox.apache.org/repos/asf/cloudstack.git


The following commit(s) were added to refs/heads/4.19 by this push:
     new e520525fe73 Use parameter dcId as wrapper to prevent NPE (#8986)
e520525fe73 is described below

commit e520525fe73b88b7a9e74af0e373e5c01477b52d
Author: dahn <d...@onecht.net>
AuthorDate: Wed May 1 09:12:36 2024 +0200

    Use parameter dcId as wrapper to prevent NPE (#8986)
---
 .../cloudstack/engine/subsystem/api/storage/EndPointSelector.java      | 2 +-
 .../apache/cloudstack/storage/endpoint/DefaultEndPointSelector.java    | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git 
a/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/EndPointSelector.java
 
b/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/EndPointSelector.java
index ec8dfe633b5..4f2a69bc771 100644
--- 
a/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/EndPointSelector.java
+++ 
b/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/EndPointSelector.java
@@ -47,5 +47,5 @@ public interface EndPointSelector {
 
     EndPoint select(DataStore store, String downloadUrl);
 
-    EndPoint findSsvm(long dcId);
+    EndPoint findSsvm(Long dcId);
 }
diff --git 
a/engine/storage/src/main/java/org/apache/cloudstack/storage/endpoint/DefaultEndPointSelector.java
 
b/engine/storage/src/main/java/org/apache/cloudstack/storage/endpoint/DefaultEndPointSelector.java
index bc16bafd7a9..ba1278f2fa0 100644
--- 
a/engine/storage/src/main/java/org/apache/cloudstack/storage/endpoint/DefaultEndPointSelector.java
+++ 
b/engine/storage/src/main/java/org/apache/cloudstack/storage/endpoint/DefaultEndPointSelector.java
@@ -338,7 +338,8 @@ public class DefaultEndPointSelector implements 
EndPointSelector {
      * 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.
      * */
-    public EndPoint findSsvm(long dcId) {
+    @Override
+    public EndPoint findSsvm(Long dcId) {
         List<HostVO> ssAHosts = 
listUpAndConnectingSecondaryStorageVmHost(dcId);
         if (ssAHosts == null || ssAHosts.isEmpty()) {
             return null;