Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 6F0FF10F28 for ; Thu, 26 Mar 2015 13:20:13 +0000 (UTC) Received: (qmail 4432 invoked by uid 500); 26 Mar 2015 13:20:08 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 4278 invoked by uid 500); 26 Mar 2015 13:20:08 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 4153 invoked by uid 99); 26 Mar 2015 13:20:08 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 26 Mar 2015 13:20:08 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id C7D10E17C9; Thu, 26 Mar 2015 13:20:07 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: dahn@apache.org To: commits@cloudstack.apache.org Date: Thu, 26 Mar 2015 13:20:09 -0000 Message-Id: <04acf6a4cb9d47749824fd552eb46eac@git.apache.org> In-Reply-To: <1466f9e2577b46498c31aff0e7fdd13a@git.apache.org> References: <1466f9e2577b46498c31aff0e7fdd13a@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/3] git commit: updated refs/heads/hotfix/findbugs-unknownvm-as-null to 6a82173 Boolean -> boolean Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/6a821730 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/6a821730 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/6a821730 Branch: refs/heads/hotfix/findbugs-unknownvm-as-null Commit: 6a821730cea7720d44e5f7293ed340a1b290c90c Parents: de44458 Author: Daan Hoogland Authored: Wed Mar 25 22:20:40 2015 +0100 Committer: Daan Hoogland Committed: Wed Mar 25 22:20:40 2015 +0100 ---------------------------------------------------------------------- api/src/com/cloud/ha/Investigator.java | 2 +- .../hypervisors/hyperv/src/com/cloud/ha/HypervInvestigator.java | 2 +- plugins/hypervisors/kvm/src/com/cloud/ha/KVMInvestigator.java | 2 +- .../ovm3/src/main/java/com/cloud/ha/Ovm3Investigator.java | 2 +- .../simulator/src/com/cloud/ha/SimulatorInvestigator.java | 2 +- .../hypervisors/vmware/src/com/cloud/ha/VmwareInvestigator.java | 2 +- server/src/com/cloud/ha/CheckOnAgentInvestigator.java | 2 +- server/src/com/cloud/ha/ManagementIPSystemVMInvestigator.java | 2 +- server/src/com/cloud/ha/UserVmDomRInvestigator.java | 2 +- server/src/com/cloud/ha/XenServerInvestigator.java | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6a821730/api/src/com/cloud/ha/Investigator.java ---------------------------------------------------------------------- diff --git a/api/src/com/cloud/ha/Investigator.java b/api/src/com/cloud/ha/Investigator.java index bc6f331..88d802a 100644 --- a/api/src/com/cloud/ha/Investigator.java +++ b/api/src/com/cloud/ha/Investigator.java @@ -27,7 +27,7 @@ public interface Investigator extends Adapter { * * @param vm to work on. */ - public Boolean isVmAlive(VirtualMachine vm, Host host) throws UnknownVM; + public boolean isVmAlive(VirtualMachine vm, Host host) throws UnknownVM; public Status isAgentAlive(Host agent); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6a821730/plugins/hypervisors/hyperv/src/com/cloud/ha/HypervInvestigator.java ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/hyperv/src/com/cloud/ha/HypervInvestigator.java b/plugins/hypervisors/hyperv/src/com/cloud/ha/HypervInvestigator.java index 8b94672..634f242 100644 --- a/plugins/hypervisors/hyperv/src/com/cloud/ha/HypervInvestigator.java +++ b/plugins/hypervisors/hyperv/src/com/cloud/ha/HypervInvestigator.java @@ -44,7 +44,7 @@ public class HypervInvestigator extends AdapterBase implements Investigator { @Inject ResourceManager _resourceMgr; @Override - public Boolean isVmAlive(com.cloud.vm.VirtualMachine vm, Host host) throws UnknownVM { + public boolean isVmAlive(com.cloud.vm.VirtualMachine vm, Host host) throws UnknownVM { Status status = isAgentAlive(host); if (status == null) { throw new UnknownVM(); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6a821730/plugins/hypervisors/kvm/src/com/cloud/ha/KVMInvestigator.java ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/kvm/src/com/cloud/ha/KVMInvestigator.java b/plugins/hypervisors/kvm/src/com/cloud/ha/KVMInvestigator.java index b519312..43cc71d 100644 --- a/plugins/hypervisors/kvm/src/com/cloud/ha/KVMInvestigator.java +++ b/plugins/hypervisors/kvm/src/com/cloud/ha/KVMInvestigator.java @@ -47,7 +47,7 @@ public class KVMInvestigator extends AdapterBase implements Investigator { ResourceManager _resourceMgr; @Override - public Boolean isVmAlive(com.cloud.vm.VirtualMachine vm, Host host) throws UnknownVM { + public boolean isVmAlive(com.cloud.vm.VirtualMachine vm, Host host) throws UnknownVM { Status status = isAgentAlive(host); if (status == null) { throw new UnknownVM(); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6a821730/plugins/hypervisors/ovm3/src/main/java/com/cloud/ha/Ovm3Investigator.java ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/ovm3/src/main/java/com/cloud/ha/Ovm3Investigator.java b/plugins/hypervisors/ovm3/src/main/java/com/cloud/ha/Ovm3Investigator.java index 56f904b..f9e88c0 100644 --- a/plugins/hypervisors/ovm3/src/main/java/com/cloud/ha/Ovm3Investigator.java +++ b/plugins/hypervisors/ovm3/src/main/java/com/cloud/ha/Ovm3Investigator.java @@ -46,7 +46,7 @@ public class Ovm3Investigator extends AdapterBase implements Investigator { ResourceManager resourceMgr; @Override - public Boolean isVmAlive(com.cloud.vm.VirtualMachine vm, Host host) throws UnknownVM { + public boolean isVmAlive(com.cloud.vm.VirtualMachine vm, Host host) throws UnknownVM { LOGGER.debug("isVmAlive: " + vm.getHostName() + " on " + host.getName()); if (host.getHypervisorType() != Hypervisor.HypervisorType.Ovm3) { throw new UnknownVM(); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6a821730/plugins/hypervisors/simulator/src/com/cloud/ha/SimulatorInvestigator.java ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/simulator/src/com/cloud/ha/SimulatorInvestigator.java b/plugins/hypervisors/simulator/src/com/cloud/ha/SimulatorInvestigator.java index 9366b83..bc55ba3 100644 --- a/plugins/hypervisors/simulator/src/com/cloud/ha/SimulatorInvestigator.java +++ b/plugins/hypervisors/simulator/src/com/cloud/ha/SimulatorInvestigator.java @@ -80,7 +80,7 @@ public class SimulatorInvestigator extends AdapterBase implements Investigator { } @Override - public Boolean isVmAlive(VirtualMachine vm, Host host) throws UnknownVM { + public boolean isVmAlive(VirtualMachine vm, Host host) throws UnknownVM { CheckVirtualMachineCommand cmd = new CheckVirtualMachineCommand(vm.getInstanceName()); try { Answer answer = _agentMgr.send(vm.getHostId(), cmd); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6a821730/plugins/hypervisors/vmware/src/com/cloud/ha/VmwareInvestigator.java ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/vmware/src/com/cloud/ha/VmwareInvestigator.java b/plugins/hypervisors/vmware/src/com/cloud/ha/VmwareInvestigator.java index 0fda96a..3f7a05c 100644 --- a/plugins/hypervisors/vmware/src/com/cloud/ha/VmwareInvestigator.java +++ b/plugins/hypervisors/vmware/src/com/cloud/ha/VmwareInvestigator.java @@ -38,7 +38,7 @@ public class VmwareInvestigator extends AdapterBase implements Investigator { } @Override - public Boolean isVmAlive(VirtualMachine vm, Host host) throws UnknownVM { + public boolean isVmAlive(VirtualMachine vm, Host host) throws UnknownVM { if (vm.getHypervisorType() == HypervisorType.VMware) return true; http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6a821730/server/src/com/cloud/ha/CheckOnAgentInvestigator.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/ha/CheckOnAgentInvestigator.java b/server/src/com/cloud/ha/CheckOnAgentInvestigator.java index fdb587b..b2e333f 100644 --- a/server/src/com/cloud/ha/CheckOnAgentInvestigator.java +++ b/server/src/com/cloud/ha/CheckOnAgentInvestigator.java @@ -47,7 +47,7 @@ public class CheckOnAgentInvestigator extends AdapterBase implements Investigato } @Override - public Boolean isVmAlive(VirtualMachine vm, Host host) throws UnknownVM { + public boolean isVmAlive(VirtualMachine vm, Host host) throws UnknownVM { CheckVirtualMachineCommand cmd = new CheckVirtualMachineCommand(vm.getInstanceName()); try { CheckVirtualMachineAnswer answer = (CheckVirtualMachineAnswer)_agentMgr.send(vm.getHostId(), cmd); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6a821730/server/src/com/cloud/ha/ManagementIPSystemVMInvestigator.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/ha/ManagementIPSystemVMInvestigator.java b/server/src/com/cloud/ha/ManagementIPSystemVMInvestigator.java index 3f1b17f..5db5b9c 100644 --- a/server/src/com/cloud/ha/ManagementIPSystemVMInvestigator.java +++ b/server/src/com/cloud/ha/ManagementIPSystemVMInvestigator.java @@ -42,7 +42,7 @@ public class ManagementIPSystemVMInvestigator extends AbstractInvestigatorImpl { private final NetworkModel _networkMgr = null; @Override - public Boolean isVmAlive(VirtualMachine vm, Host host) throws UnknownVM { + public boolean isVmAlive(VirtualMachine vm, Host host) throws UnknownVM { if (!vm.getType().isUsedBySystem()) { s_logger.debug("Not a System Vm, unable to determine state of " + vm + " returning null"); } http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6a821730/server/src/com/cloud/ha/UserVmDomRInvestigator.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/ha/UserVmDomRInvestigator.java b/server/src/com/cloud/ha/UserVmDomRInvestigator.java index b3a5ec1..6084e76 100644 --- a/server/src/com/cloud/ha/UserVmDomRInvestigator.java +++ b/server/src/com/cloud/ha/UserVmDomRInvestigator.java @@ -53,7 +53,7 @@ public class UserVmDomRInvestigator extends AbstractInvestigatorImpl { private final VpcVirtualNetworkApplianceManager _vnaMgr = null; @Override - public Boolean isVmAlive(VirtualMachine vm, Host host) throws UnknownVM { + public boolean isVmAlive(VirtualMachine vm, Host host) throws UnknownVM { if (vm.getType() != VirtualMachine.Type.User) { if (s_logger.isDebugEnabled()) { s_logger.debug("Not a User Vm, unable to determine state of " + vm + " returning null"); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6a821730/server/src/com/cloud/ha/XenServerInvestigator.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/ha/XenServerInvestigator.java b/server/src/com/cloud/ha/XenServerInvestigator.java index b6549f8..07eb76b 100644 --- a/server/src/com/cloud/ha/XenServerInvestigator.java +++ b/server/src/com/cloud/ha/XenServerInvestigator.java @@ -77,7 +77,7 @@ public class XenServerInvestigator extends AdapterBase implements Investigator { } @Override - public Boolean isVmAlive(VirtualMachine vm, Host host) throws UnknownVM { + public boolean isVmAlive(VirtualMachine vm, Host host) throws UnknownVM { Status status = isAgentAlive(host); if (status == null) { throw new UnknownVM();