cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bfede...@apache.org
Subject [20/34] git commit: updated refs/heads/ui-restyle to 23093ed
Date Thu, 26 Sep 2013 18:03:21 GMT
CLOUDSTACK-4459: fix silly bug, one more time


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

Branch: refs/heads/ui-restyle
Commit: a96f6b306b22ef4d17dae66cc754434cd71f9fc7
Parents: 8811435
Author: Edison Su <sudison@gmail.com>
Authored: Thu Aug 29 14:24:35 2013 -0700
Committer: Edison Su <sudison@gmail.com>
Committed: Wed Sep 25 16:17:54 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/a96f6b30/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;
             }


Mime
View raw message