You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ml...@apache.org on 2014/03/04 01:44:39 UTC

git commit: updated refs/heads/resize-root to 974fc4e

Repository: cloudstack
Updated Branches:
  refs/heads/resize-root 23c113bff -> 974fc4e67


resizeVolume: Volume can be in ready state or allocated state to resize


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

Branch: refs/heads/resize-root
Commit: 974fc4e6717223acb108f7411cd0c6942c0bdba3
Parents: 23c113b
Author: Marcus Sorensen <ma...@betterservers.com>
Authored: Mon Mar 3 17:44:30 2014 -0700
Committer: Marcus Sorensen <ma...@betterservers.com>
Committed: Mon Mar 3 17:44:30 2014 -0700

----------------------------------------------------------------------
 server/src/com/cloud/storage/VolumeApiServiceImpl.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/974fc4e6/server/src/com/cloud/storage/VolumeApiServiceImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/storage/VolumeApiServiceImpl.java b/server/src/com/cloud/storage/VolumeApiServiceImpl.java
index 71636b1..e99dce7 100644
--- a/server/src/com/cloud/storage/VolumeApiServiceImpl.java
+++ b/server/src/com/cloud/storage/VolumeApiServiceImpl.java
@@ -705,7 +705,7 @@ public class VolumeApiServiceImpl extends ManagerBase implements VolumeApiServic
             throw new InvalidParameterValueException("Cloudstack currently only supports volumes marked as KVM, VMware, XenServer hypervisor for resize");
         }
 
-        if (volume.getState() != Volume.State.Ready || volume.getState() != Volume.State.Allocated) {
+        if (volume.getState() != Volume.State.Ready && volume.getState() != Volume.State.Allocated) {
             throw new InvalidParameterValueException("Volume should be in ready or allocated state before attempting a resize");
         }