From 3efa2767a88cdc68aadb4d8acb8ca2198ed39538 Mon Sep 17 00:00:00 2001
From: Min Chen <min.chen@citrix.com>
Date: Fri, 9 Aug 2013 18:11:53 -0700
Subject: [PATCH] CLOUDSTACK-4204: return a ZoneScope in picking cache storage.

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

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 b64346674c4..0fed922ab41 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
@@ -183,11 +183,11 @@ public class AncientDataMotionStrategy implements DataMotionStrategy {
 
         Scope selectedScope = null;
         if (srcScope.getScopeId() != null) {
-            selectedScope = srcScope;
+            selectedScope = getZoneScope(srcScope);
         } else if (destScope.getScopeId() != null) {
-            selectedScope = destScope;
+            selectedScope = getZoneScope(destScope);
         } else {
-            s_logger.warn("Cannot find a zone-wide scope for move between cache store and image store");
+            s_logger.warn("Cannot find a zone-wide scope for movement that needs a cache storage");
         }
         return selectedScope;
     }