mirror of
https://github.com/apache/cloudstack.git
synced 2025-10-26 08:42:29 +01:00
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 This closes #39
This commit is contained in:
parent
b008d78b57
commit
055f6ad318
@ -18,6 +18,13 @@
|
|||||||
*/
|
*/
|
||||||
package com.cloud.ha;
|
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.AgentManager;
|
||||||
import com.cloud.agent.api.Answer;
|
import com.cloud.agent.api.Answer;
|
||||||
import com.cloud.agent.api.CheckOnHostCommand;
|
import com.cloud.agent.api.CheckOnHostCommand;
|
||||||
@ -28,11 +35,6 @@ import com.cloud.host.dao.HostDao;
|
|||||||
import com.cloud.hypervisor.Hypervisor;
|
import com.cloud.hypervisor.Hypervisor;
|
||||||
import com.cloud.resource.ResourceManager;
|
import com.cloud.resource.ResourceManager;
|
||||||
import com.cloud.utils.component.AdapterBase;
|
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)
|
@Local(value=Investigator.class)
|
||||||
public class HypervInvestigator extends AdapterBase implements Investigator {
|
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) {
|
public Boolean isVmAlive(com.cloud.vm.VirtualMachine vm, Host host) {
|
||||||
Status status = isAgentAlive(host);
|
Status status = isAgentAlive(host);
|
||||||
if (status == null) {
|
if (status == null) {
|
||||||
return false;
|
return null;
|
||||||
}
|
}
|
||||||
return status == Status.Up ? true : false;
|
return status == Status.Up ? true : null;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user