Skip to content

Commit c80b886

Browse files
authored
Fix hostId verification on unsuccessful expunge operation (#10418)
1 parent 4b432c8 commit c80b886

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -707,7 +707,7 @@ protected void advanceExpunge(VMInstanceVO vm) throws ResourceUnavailableExcepti
707707

708708
private void handleUnsuccessfulExpungeOperation(List<Command> finalizeExpungeCommands, List<Command> nicExpungeCommands,
709709
VMInstanceVO vm, Long hostId) throws OperationTimedoutException, AgentUnavailableException {
710-
if (CollectionUtils.isNotEmpty(finalizeExpungeCommands) || CollectionUtils.isNotEmpty(nicExpungeCommands) && (hostId != null)) {
710+
if ((CollectionUtils.isNotEmpty(finalizeExpungeCommands) || CollectionUtils.isNotEmpty(nicExpungeCommands)) && hostId != null) {
711711
final Commands cmds = new Commands(Command.OnError.Stop);
712712
addAllExpungeCommandsFromList(finalizeExpungeCommands, cmds, vm);
713713
addAllExpungeCommandsFromList(nicExpungeCommands, cmds, vm);

0 commit comments

Comments
 (0)