From 7707d3fd92c8aa9dc181e635183e20818aed93cd Mon Sep 17 00:00:00 2001 From: Rohit Yadav Date: Fri, 7 Aug 2020 15:05:34 +0530 Subject: [PATCH] engine: fix NPE from fwd-merge 562a7db8dfd923c986f231a42c15669922574a7c This fixes NPE caused due to merge conflict fix from the forward merge commit 562a7db8dfd923c986f231a42c15669922574a7c and fixes travis test regression: === TestName: test_01_reset_vm_on_reboot | Status : SUCCESS === Signed-off-by: Rohit Yadav --- .../main/java/com/cloud/vm/VirtualMachineManagerImpl.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) 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 31bdd8ce859..f05cbbcb26d 100755 --- a/engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java +++ b/engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java @@ -1332,6 +1332,9 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac } private void logBootModeParameters(Map params) { + if (params == null) { + return; + } StringBuffer msgBuf = new StringBuffer("Uefi params "); boolean log = false; if (params.get(VirtualMachineProfile.Param.UefiFlag) != null) { @@ -3323,7 +3326,10 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac } private void checkAndSetEnterSetupMode(VirtualMachineTO vmTo, Map params) { - Boolean enterSetup = (Boolean)params.get(VirtualMachineProfile.Param.BootIntoSetup); + Boolean enterSetup = null; + if (params != null) { + enterSetup = (Boolean) params.get(VirtualMachineProfile.Param.BootIntoSetup); + } if (s_logger.isTraceEnabled()) { s_logger.trace(String.format("orchestrating VM reboot for '%s' %s set to %s", vmTo.getName(), VirtualMachineProfile.Param.BootIntoSetup, enterSetup)); }