You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by an...@apache.org on 2013/09/04 01:41:32 UTC
[03/21] git commit: updated refs/heads/4.2 to 51707d8
CLOUDSTACK-4459: fix silly bug, one more time
(cherry picked from commit 93bfe708d9cc4da6a7bec3ecaaa17812b2b73048)
Signed-off-by: animesh <an...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/499bd934
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/499bd934
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/499bd934
Branch: refs/heads/4.2
Commit: 499bd9349fbd5d2e6a39cab57f97248920473340
Parents: e3eefdf
Author: Edison Su <su...@gmail.com>
Authored: Thu Aug 29 14:24:35 2013 -0700
Committer: animesh <an...@apache.org>
Committed: Tue Sep 3 16:13:17 2013 -0700
----------------------------------------------------------------------
.../src/com/cloud/hypervisor/kvm/storage/LibvirtStoragePool.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/499bd934/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStoragePool.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStoragePool.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStoragePool.java
index dc7981c..c0e1000 100644
--- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStoragePool.java
+++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStoragePool.java
@@ -129,7 +129,7 @@ public class LibvirtStoragePool implements KVMStoragePool {
try {
disk = this._storageAdaptor.getPhysicalDisk(volumeUuid, this);
} catch (CloudRuntimeException e) {
- if ((this.getStoragePoolType() != StoragePoolType.NetworkFilesystem) ||
+ if ((this.getStoragePoolType() != StoragePoolType.NetworkFilesystem) &&
(this.getStoragePoolType() != StoragePoolType.Filesystem)) {
throw e;
}