You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by mc...@apache.org on 2013/12/19 00:42:48 UTC
git commit: updated refs/heads/4.3 to 3ce63be
Updated Branches:
refs/heads/4.3 b7a81f842 -> 3ce63bef8
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/3ce63bef
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/3ce63bef
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/3ce63bef
Branch: refs/heads/4.3
Commit: 3ce63bef8254aaa295a9e835d2ec27285a406ff2
Parents: b7a81f8
Author: Min Chen <mi...@citrix.com>
Authored: Wed Dec 18 15:41:37 2013 -0800
Committer: Min Chen <mi...@citrix.com>
Committed: Wed Dec 18 15:42:13 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/3ce63bef/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 ac99e92..8e65e80 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
@@ -508,11 +508,9 @@ 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) {