You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by da...@apache.org on 2015/06/17 12:08:11 UTC
git commit: updated refs/heads/master to d056c3d
Repository: cloudstack
Updated Branches:
refs/heads/master d702b63bf -> d056c3d27
Fix findbugs RCN_REDUNDANT_NULLCHECK_OF_NONNULL_VALUE in VirtualMachineManagerImpl.java Removed two unnecessary null checks as this piece of code will only run if answer is not null, as satified in condition stated in line #1253
Signed-off-by: Daan Hoogland <da...@gmail.com>
This closes #445
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/d056c3d2
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d056c3d2
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d056c3d2
Branch: refs/heads/master
Commit: d056c3d279823e321b0be2bde83946cbf51d0e41
Parents: d702b63
Author: Rafael da Fonseca <rs...@gmail.com>
Authored: Sun Jun 14 21:21:51 2015 +0200
Committer: Daan Hoogland <da...@gmail.com>
Committed: Wed Jun 17 12:07:54 2015 +0200
----------------------------------------------------------------------
.../src/com/cloud/vm/VirtualMachineManagerImpl.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d056c3d2/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 ad31fdd..057c9e2 100644
--- a/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
+++ b/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
@@ -1266,8 +1266,8 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
if (gpuDevice != null) {
_resourceMgr.updateGPUDetails(vm.getHostId(), gpuDevice.getGroupDetails());
}
- if (answer == null || !answer.getResult()) {
- final String details = answer != null ? answer.getDetails() : "null answer returned";
+ if (!answer.getResult()) {
+ final String details = answer.getDetails();
s_logger.debug("Unable to stop VM due to " + details);
return false;
}