From 11a25afa0dd7de5e260b42462eb0d8a6db79e264 Mon Sep 17 00:00:00 2001 From: Daan Hoogland Date: Mon, 30 Mar 2026 12:08:56 +0200 Subject: [PATCH] merge bug fixed --- server/src/main/java/com/cloud/vm/UserVmManagerImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java b/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java index 3cb3de1b99b..2d32d30e40b 100644 --- a/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java +++ b/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java @@ -5604,7 +5604,7 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir } private void checkForceStopVmPermission(Account callingAccount) { - callingAccountId = callingAccount == null ? null : callingAccount.getId(); + Long callingAccountId = callingAccount == null ? null : callingAccount.getId(); if (!AllowUserForceStopVm.valueIn(callingAccountId)) { logger.error("Parameter [{}] can only be passed by Admin accounts or when the allow.user.force.stop.vm config is true for the account.", ApiConstants.FORCED); throw new PermissionDeniedException("Account does not have the permission to force stop the vm.");