Repository: cloudstack Updated Branches: refs/heads/4.5 4c21172f3 -> d42e3df9c
CLOUDSTACK-7563: Fix potential NPE in checking answer Signed-off-by: Rohit Yadav <rohit.ya...@shapeblue.com> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/d42e3df9 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d42e3df9 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d42e3df9 Branch: refs/heads/4.5 Commit: d42e3df9cf43b0ad46d406c6ab5b1d8c811d0239 Parents: 4c21172 Author: Rohit Yadav <rohit.ya...@shapeblue.com> Authored: Tue Dec 2 16:14:29 2014 +0530 Committer: Rohit Yadav <rohit.ya...@shapeblue.com> Committed: Tue Dec 2 16:14:29 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/d42e3df9/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 211c32c..8377906 100755 --- a/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java +++ b/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java @@ -1247,7 +1247,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; }
