You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by pr...@apache.org on 2013/04/05 23:02:59 UTC

[04/50] [abbrv] git commit: updated refs/heads/affinity_groups to ca1a794

CLOUDSTACK-1830: ZWPS: NPE while create volume from snapshot


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/6110e00c
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/6110e00c
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/6110e00c

Branch: refs/heads/affinity_groups
Commit: 6110e00c549630e8b08fc6ca4818a60ef6a0c919
Parents: b798c45
Author: Harikrishna Patnala <ha...@citrix.com>
Authored: Tue Apr 2 19:11:08 2013 +0530
Committer: Edison Su <su...@gmail.com>
Committed: Tue Apr 2 10:40:42 2013 -0700

----------------------------------------------------------------------
 .../allocator/ZoneWideStoragePoolAllocator.java    |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6110e00c/engine/storage/src/org/apache/cloudstack/storage/allocator/ZoneWideStoragePoolAllocator.java
----------------------------------------------------------------------
diff --git a/engine/storage/src/org/apache/cloudstack/storage/allocator/ZoneWideStoragePoolAllocator.java b/engine/storage/src/org/apache/cloudstack/storage/allocator/ZoneWideStoragePoolAllocator.java
index c45f8a8..a4aa3d5 100644
--- a/engine/storage/src/org/apache/cloudstack/storage/allocator/ZoneWideStoragePoolAllocator.java
+++ b/engine/storage/src/org/apache/cloudstack/storage/allocator/ZoneWideStoragePoolAllocator.java
@@ -56,7 +56,7 @@ public class ZoneWideStoragePoolAllocator extends AbstractStoragePoolAllocator {
 			VirtualMachineProfile<? extends VirtualMachine> vmProfile,
 			DeploymentPlan plan, ExcludeList avoid, int returnUpTo) {
 		List<StoragePool> suitablePools = new ArrayList<StoragePool>();
-		HypervisorType hypervisor = vmProfile.getHypervisorType();
+		HypervisorType hypervisor = dskCh.getHypersorType();
 		if (hypervisor != null) {
 			if (hypervisor != HypervisorType.KVM) {
 				s_logger.debug("Only kvm supports zone wide storage");