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

minchen07 · minchen07 · commit bb91b739a890 · 2013-12-18T15:44:00.000-08:00
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
@@ -497,11 +497,9 @@ protected Answer copySnapshot(DataObject srcData, DataObject destData) {
                     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) {

Original file line number	Diff line number	Diff line change
`@@ -497,11 +497,9 @@ protected Answer copySnapshot(DataObject srcData, DataObject destData) {`
`497`	`497`	`answer = ep.sendMessage(cmd);`
`498`	`498`	`}`
`499`	`499`	`}`
`500`		`- // clean up cache entry in case of failure`
`501`		`- if (answer == null \|\| !answer.getResult()) {`
`502`		`- if (cacheData != null) {`
`503`		`- cacheMgr.deleteCacheObject(cacheData);`
`504`		`- }`
	`500`	`+ // clean up cache entry`
	`501`	`+ if (cacheData != null) {`
	`502`	`+ cacheMgr.deleteCacheObject(cacheData);`
`505`	`503`	`}`
`506`	`504`	`return answer;`
`507`	`505`	`} catch (Exception e) {`