From a43d0a6085fe9bbcb84fdae92484355910060da0 Mon Sep 17 00:00:00 2001 From: nvazquez Date: Sun, 20 Sep 2020 01:43:04 -0300 Subject: [PATCH] Fix VM power sync NPE on system VMs --- .../main/java/com/cloud/vm/VirtualMachineManagerImpl.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java b/engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java index 7ed090db9ff..013eb411ad8 100755 --- a/engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java +++ b/engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java @@ -1666,9 +1666,11 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac } guru.finalizeStop(profile, answer); - final UserVmVO userVm = _userVmDao.findById(vm.getId()); - userVm.setPowerState(PowerState.PowerOff); - _userVmDao.update(userVm.getId(), userVm); + if (vm.getType() == VirtualMachine.Type.User) { + final UserVmVO userVm = _userVmDao.findById(vm.getId()); + userVm.setPowerState(PowerState.PowerOff); + _userVmDao.update(userVm.getId(), userVm); + } } else { s_logger.error("Invalid answer received in response to a StopCommand for " + vm.getInstanceName()); return false;