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

minchen07 · minchen07 · commit 3ce63bef8254 · 2013-12-18T15:42:13.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
@@ -508,11 +508,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
`@@ -508,11 +508,9 @@ protected Answer copySnapshot(DataObject srcData, DataObject destData) {`
`508`	`508`	`answer = ep.sendMessage(cmd);`
`509`	`509`	`}`
`510`	`510`	`}`
`511`		`- // clean up cache entry in case of failure`
`512`		`- if (answer == null \|\| !answer.getResult()) {`
`513`		`- if (cacheData != null) {`
`514`		`- cacheMgr.deleteCacheObject(cacheData);`
`515`		`- }`
	`511`	`+ // clean up cache entry`
	`512`	`+ if (cacheData != null) {`
	`513`	`+ cacheMgr.deleteCacheObject(cacheData);`
`516`	`514`	`}`
`517`	`515`	`return answer;`
`518`	`516`	`} catch (Exception e) {`