You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by sa...@apache.org on 2015/01/06 16:33:32 UTC
[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 <da...@onecht.net>
Authored: Mon Jan 5 15:43:51 2015 +0100
Committer: Daan Hoogland <da...@onecht.net>
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;