merge bug fixed

Daan Hoogland · Daan Hoogland · commit 11a25afa0dd7 · 2026-05-04T11:16:02.000+02:00
diff --git 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 void finalizeExpunge(VirtualMachine vm) {
     }
 
     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.");

Original file line number	Diff line number	Diff line change
`@@ -5604,7 +5604,7 @@ public void finalizeExpunge(VirtualMachine vm) {`
`5604`	`5604`	`}`
`5605`	`5605`
`5606`	`5606`	`private void checkForceStopVmPermission(Account callingAccount) {`
`5607`		`- callingAccountId = callingAccount == null ? null : callingAccount.getId();`
	`5607`	`+ Long callingAccountId = callingAccount == null ? null : callingAccount.getId();`
`5608`	`5608`	`if (!AllowUserForceStopVm.valueIn(callingAccountId)) {`
`5609`	`5609`	`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);`
`5610`	`5610`	`throw new PermissionDeniedException("Account does not have the permission to force stop the vm.");`