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 D273B104B2 for ; Tue, 6 Jan 2015 15:33:23 +0000 (UTC) Received: (qmail 84958 invoked by uid 500); 6 Jan 2015 15:33:16 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 84899 invoked by uid 500); 6 Jan 2015 15:33:16 -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 84261 invoked by uid 99); 6 Jan 2015 15:33:16 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 06 Jan 2015 15:33:16 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 450459215CC; Tue, 6 Jan 2015 15:33:16 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sateesh@apache.org To: commits@cloudstack.apache.org Date: Tue, 06 Jan 2015 15:33:32 -0000 Message-Id: In-Reply-To: <389c2a5cdd1f4d088dc4eab71e0c28f6@git.apache.org> References: <389c2a5cdd1f4d088dc4eab71e0c28f6@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [18/25] git commit: updated refs/heads/vmware-disk-controllers to e8a54f4 CID-1261669 added comment to clarify false positive Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/54e5f28a Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/54e5f28a Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/54e5f28a Branch: refs/heads/vmware-disk-controllers Commit: 54e5f28acec2e665a56b2c60a98d6eb8b045f5f1 Parents: 22d6565 Author: Daan Hoogland Authored: Mon Jan 5 15:43:51 2015 +0100 Committer: Daan Hoogland Committed: Mon Jan 5 15:43:51 2015 +0100 ---------------------------------------------------------------------- .../com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java | 1 + 1 file changed, 1 insertion(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/54e5f28a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java index f01153f..ccf4626 100644 --- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java +++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java @@ -4244,6 +4244,7 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe if (cpuInfo.get("socket_count") != null) { _host.cpuSockets = Integer.parseInt(cpuInfo.get("socket_count")); } + // would hcs be null we would have thrown an exception on condition (_host.cpus <= 0) by now for (final HostCpu hc : hcs) { _host.speed = hc.getSpeed(conn).intValue(); break;