You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by li...@apache.org on 2015/04/28 06:28:00 UTC

git commit: updated refs/heads/master to 10a106f

Repository: cloudstack
Updated Branches:
  refs/heads/master de7173a0e -> 10a106f5d


CLOUDSTACK-8411. Unable to delete an uploaded volume after CCP fails to attach the volume to a VM.
Correctly update the status of an uploaded volume upon failure to attach it to a VM.


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

Branch: refs/heads/master
Commit: 10a106f5d86a7f6786b94a7298a5c63c32eab66b
Parents: de7173a
Author: Likitha Shetty <li...@citrix.com>
Authored: Thu Mar 26 17:25:12 2015 +0530
Committer: Likitha Shetty <li...@citrix.com>
Committed: Tue Apr 28 09:52:06 2015 +0530

----------------------------------------------------------------------
 .../org/apache/cloudstack/storage/volume/VolumeServiceImpl.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/10a106f5/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java
----------------------------------------------------------------------
diff --git a/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java b/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java
index 325c269..3a52c83 100644
--- a/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java
+++ b/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java
@@ -893,7 +893,7 @@ public class VolumeServiceImpl implements VolumeService {
         AsyncCallFuture<VolumeApiResult> future = context.future;
         VolumeApiResult res = new VolumeApiResult(destVolume);
         try {
-            if (res.isFailed()) {
+            if (result.isFailed()) {
                 destVolume.processEvent(Event.OperationFailed);
                 srcVolume.processEvent(Event.OperationFailed);
                 res.setResult(result.getResult());