Repository: cloudstack Updated Branches: refs/heads/master 0407fb334 -> f40e31e06
CLOUDSTACK-7563: Fix potential NPE in checking answer Signed-off-by: Rohit Yadav <[email protected]> (cherry picked from commit d42e3df9cf43b0ad46d406c6ab5b1d8c811d0239) Signed-off-by: Rohit Yadav <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/f40e31e0 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f40e31e0 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f40e31e0 Branch: refs/heads/master Commit: f40e31e061a6e10c67fc3c4db997138e071f9fa2 Parents: 0407fb3 Author: Rohit Yadav <[email protected]> Authored: Tue Dec 2 16:14:29 2014 +0530 Committer: Rohit Yadav <[email protected]> Committed: Tue Dec 2 16:46:09 2014 +0530 ---------------------------------------------------------------------- .../orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f40e31e0/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java ---------------------------------------------------------------------- diff --git a/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java b/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java index 95026d6..d772848 100644 --- a/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java +++ b/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java @@ -1254,7 +1254,8 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac _resourceMgr.updateGPUDetails(vm.getHostId(), gpuDevice.getGroupDetails()); } if (answer == null || !answer.getResult()) { - s_logger.debug("Unable to stop VM due to " + answer.getDetails()); + String details = (answer != null) ? answer.getDetails() : "null answer returned"; + s_logger.debug("Unable to stop VM due to " + details); return false; }
