Update PR#8624: change return type of Nic.getInstanceId from long to …

…Long
weizhouapache · Feb 12, 2024 · 9855c1c · 9855c1c
1 parent c426a19
commit 9855c1c
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/api/src/main/java/com/cloud/vm/Nic.java b/api/src/main/java/com/cloud/vm/Nic.java
@@ -125,7 +125,7 @@ public enum ReservationStrategy {
     /**
      * @return the vm instance id that this nic belongs to.
      */
-    long getInstanceId();
+    Long getInstanceId();
 
     int getDeviceId();
 

diff --git a/engine/schema/src/main/java/com/cloud/vm/NicVO.java b/engine/schema/src/main/java/com/cloud/vm/NicVO.java
@@ -252,7 +252,7 @@ public long getId() {
     }
 
     @Override
-    public long getInstanceId() {
+    public Long getInstanceId() {
         return instanceId;
     }
 

diff --git a/server/src/main/java/com/cloud/api/ApiResponseHelper.java b/server/src/main/java/com/cloud/api/ApiResponseHelper.java
@@ -992,7 +992,7 @@ private void addSystemVmInfoToIpResponse(NicVO nic, IPAddressResponse ipResponse
         if (!isAdmin) {
             return;
         }
-        if (nic == null || Nic.ReservationStrategy.PlaceHolder.equals(nic.getReservationStrategy())) {
+        if (nic == null || nic.getInstanceId() == null) {
             return;
         }
         VirtualMachine vm = ApiDBUtils.findVMInstanceById(nic.getInstanceId());