From fe07c08c0093bbe89732bf6509f12ec8a8a0a8f2 Mon Sep 17 00:00:00 2001 From: Anshul Gangwar Date: Mon, 17 Nov 2014 13:00:42 +0530 Subject: [PATCH] CLOUDSTACK-7932: Fixed wrong semantics for isVmAlive() method in HypervInvestigator Findbugs will report error on this as it is expecting true/false for Boolean value. But we have diffrent meaning for null so it is false positive case from findbug --- .../src/com/cloud/ha/HypervInvestigator.java | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/plugins/hypervisors/hyperv/src/com/cloud/ha/HypervInvestigator.java b/plugins/hypervisors/hyperv/src/com/cloud/ha/HypervInvestigator.java index 01d75fa64ce1..65498e450b06 100644 --- a/plugins/hypervisors/hyperv/src/com/cloud/ha/HypervInvestigator.java +++ b/plugins/hypervisors/hyperv/src/com/cloud/ha/HypervInvestigator.java @@ -18,6 +18,13 @@ */ package com.cloud.ha; +import java.util.List; + +import javax.ejb.Local; +import javax.inject.Inject; + +import org.apache.log4j.Logger; + import com.cloud.agent.AgentManager; import com.cloud.agent.api.Answer; import com.cloud.agent.api.CheckOnHostCommand; @@ -28,11 +35,6 @@ import com.cloud.hypervisor.Hypervisor; import com.cloud.resource.ResourceManager; import com.cloud.utils.component.AdapterBase; -import org.apache.log4j.Logger; - -import javax.ejb.Local; -import javax.inject.Inject; -import java.util.List; @Local(value=Investigator.class) public class HypervInvestigator extends AdapterBase implements Investigator { @@ -45,9 +47,9 @@ public class HypervInvestigator extends AdapterBase implements Investigator { public Boolean isVmAlive(com.cloud.vm.VirtualMachine vm, Host host) { Status status = isAgentAlive(host); if (status == null) { - return false; + return null; } - return status == Status.Up ? true : false; + return status == Status.Up ? true : null; } @Override