Return-Path: X-Original-To: apmail-incubator-cloudstack-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-cloudstack-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 0F36CEFD4 for ; Sat, 12 Jan 2013 14:09:07 +0000 (UTC) Received: (qmail 25598 invoked by uid 500); 12 Jan 2013 14:09:05 -0000 Delivered-To: apmail-incubator-cloudstack-commits-archive@incubator.apache.org Received: (qmail 25435 invoked by uid 500); 12 Jan 2013 14:09:05 -0000 Mailing-List: contact cloudstack-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: cloudstack-dev@incubator.apache.org Delivered-To: mailing list cloudstack-commits@incubator.apache.org Received: (qmail 25279 invoked by uid 99); 12 Jan 2013 14:09:05 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 12 Jan 2013 14:09:05 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 6C63919A61; Sat, 12 Jan 2013 14:09:05 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: bhaisaab@apache.org To: cloudstack-commits@incubator.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [27/31] git commit: ExtractVolumeCmd: Fix regression, use Zone Id for getting zone Message-Id: <20130112140905.6C63919A61@tyr.zones.apache.org> Date: Sat, 12 Jan 2013 14:09:05 +0000 (UTC) ExtractVolumeCmd: Fix regression, use Zone Id for getting zone Fixes regression introduced in b14b39a69fa295d1d20484170b95b97fe310af28 Signed-off-by: Rohit Yadav Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/40779975 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/40779975 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/40779975 Branch: refs/heads/javelin Commit: 40779975d33c554ce488a21d84e63e635e95984e Parents: 4c80684 Author: Rohit Yadav Authored: Fri Jan 11 18:39:57 2013 -0800 Committer: Rohit Yadav Committed: Fri Jan 11 18:44:20 2013 -0800 ---------------------------------------------------------------------- .../api/command/user/volume/ExtractVolumeCmd.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/40779975/api/src/org/apache/cloudstack/api/command/user/volume/ExtractVolumeCmd.java ---------------------------------------------------------------------- diff --git a/api/src/org/apache/cloudstack/api/command/user/volume/ExtractVolumeCmd.java b/api/src/org/apache/cloudstack/api/command/user/volume/ExtractVolumeCmd.java index 7f6cd05..43b25a8 100644 --- a/api/src/org/apache/cloudstack/api/command/user/volume/ExtractVolumeCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/volume/ExtractVolumeCmd.java @@ -137,7 +137,7 @@ public class ExtractVolumeCmd extends BaseAsyncCmd { Volume vol = _entityMgr.findById(Volume.class, id); response.setId(vol.getUuid()); response.setName(vol.getName()); - DataCenter zone = _entityMgr.findById(DataCenter.class, id); + DataCenter zone = _entityMgr.findById(DataCenter.class, zoneId); response.setZoneId(zone.getUuid()); response.setZoneName(zone.getName()); response.setMode(mode);