cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mc...@apache.org
Subject [1/2] git commit: updated refs/heads/master to afcf967
Date Thu, 19 Dec 2013 00:11:59 GMT
Updated Branches:
  refs/heads/master 231e7c01f -> afcf967d2


CLOUDSTACK-5541: Template Creation from snapshot failed with S3 store.


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

Branch: refs/heads/master
Commit: bb91b739a8908ba7fa8ebc8db79be79ec82a800a
Parents: 231e7c0
Author: Min Chen <min.chen@citrix.com>
Authored: Wed Dec 18 15:41:37 2013 -0800
Committer: Min Chen <min.chen@citrix.com>
Committed: Wed Dec 18 15:44:00 2013 -0800

----------------------------------------------------------------------
 .../cloudstack/storage/motion/AncientDataMotionStrategy.java | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bb91b739/engine/storage/datamotion/src/org/apache/cloudstack/storage/motion/AncientDataMotionStrategy.java
----------------------------------------------------------------------
diff --git a/engine/storage/datamotion/src/org/apache/cloudstack/storage/motion/AncientDataMotionStrategy.java
b/engine/storage/datamotion/src/org/apache/cloudstack/storage/motion/AncientDataMotionStrategy.java
index 5c1ff40..48c39cd 100644
--- a/engine/storage/datamotion/src/org/apache/cloudstack/storage/motion/AncientDataMotionStrategy.java
+++ b/engine/storage/datamotion/src/org/apache/cloudstack/storage/motion/AncientDataMotionStrategy.java
@@ -497,11 +497,9 @@ public class AncientDataMotionStrategy implements DataMotionStrategy
{
                     answer = ep.sendMessage(cmd);
                 }
             }
-            // clean up cache entry in case of failure
-            if (answer == null || !answer.getResult()) {
-                if (cacheData != null) {
-                    cacheMgr.deleteCacheObject(cacheData);
-                }
+            // clean up cache entry
+            if (cacheData != null) {
+                cacheMgr.deleteCacheObject(cacheData);
             }
             return answer;
         } catch (Exception e) {


Mime
View raw message