merge bug fixed

Daan Hoogland · Daan Hoogland · commit 229073dc4456 · 2026-03-30T12:08:56.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
@@ -5547,7 +5547,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
`@@ -5547,7 +5547,7 @@ public void finalizeExpunge(VirtualMachine vm) {`
`5547`	`5547`	`}`
`5548`	`5548`
`5549`	`5549`	`private void checkForceStopVmPermission(Account callingAccount) {`
`5550`		`- callingAccountId = callingAccount == null ? null : callingAccount.getId();`
	`5550`	`+ Long callingAccountId = callingAccount == null ? null : callingAccount.getId();`
`5551`	`5551`	`if (!AllowUserForceStopVm.valueIn(callingAccountId)) {`
`5552`	`5552`	`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);`
`5553`	`5553`	`throw new PermissionDeniedException("Account does not have the permission to force stop the vm.");`