From d4b86bb352fd7f26e65f21774b4bebd6a4f06bcb Mon Sep 17 00:00:00 2001
From: erikbocks <erik.bock@outlook.com>
Date: Mon, 19 Jan 2026 14:09:19 -0300
Subject: [PATCH] fix logic used to obtain and register entity UUID

---
 .../main/java/com/cloud/api/dispatch/ParamProcessWorker.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/server/src/main/java/com/cloud/api/dispatch/ParamProcessWorker.java b/server/src/main/java/com/cloud/api/dispatch/ParamProcessWorker.java
index 10494168b75..e36bec5c875 100644
--- a/server/src/main/java/com/cloud/api/dispatch/ParamProcessWorker.java
+++ b/server/src/main/java/com/cloud/api/dispatch/ParamProcessWorker.java
@@ -43,6 +43,7 @@ import org.apache.cloudstack.api.BaseAsyncCreateCmd;
 import org.apache.cloudstack.api.BaseCmd;
 import org.apache.cloudstack.api.BaseCmd.CommandType;
 import org.apache.cloudstack.api.EntityReference;
+import org.apache.cloudstack.api.Identity;
 import org.apache.cloudstack.api.InternalIdentity;
 import org.apache.cloudstack.api.Parameter;
 import org.apache.cloudstack.api.ServerApiException;
@@ -532,11 +533,11 @@ public class ParamProcessWorker implements DispatchWorker {
                 // Populate CallContext for each of the entity.
                 for (final Class<?> entity : entities) {
                     CallContext.current().putContextParameter(entity, internalId);
-                    final Object objVO = _entityMgr.findByUuidIncludingRemoved(entity, uuid);
+                    final Object objVO = _entityMgr.findByIdIncludingRemoved(entity, internalId);
                     if (objVO == null) {
                         continue;
                     }
-                    CallContext.current().putApiResourceUuid(annotation.name(), uuid);
+                    CallContext.current().putApiResourceUuid(annotation.name(), ((Identity) objVO).getUuid());
                 }
                 validateNaturalNumber(internalId, annotation.name());
                 return internalId;