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 4AF40E519 for ; Fri, 1 Feb 2013 06:11:43 +0000 (UTC) Received: (qmail 4853 invoked by uid 500); 1 Feb 2013 06:11:42 -0000 Delivered-To: apmail-incubator-cloudstack-commits-archive@incubator.apache.org Received: (qmail 3099 invoked by uid 500); 1 Feb 2013 06:11:40 -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 1222 invoked by uid 99); 1 Feb 2013 06:11:35 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 01 Feb 2013 06:11:35 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 4A31F828BA9; Fri, 1 Feb 2013 06:11:34 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: kishan@apache.org To: cloudstack-commits@incubator.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [20/48] git commit: refs/heads/regions - Fix a bug in listHosts that returns wrong zoneId for host. Message-Id: <20130201061134.4A31F828BA9@tyr.zones.apache.org> Date: Fri, 1 Feb 2013 06:11:34 +0000 (UTC) Fix a bug in listHosts that returns wrong zoneId for host. Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/6b190868 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/6b190868 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/6b190868 Branch: refs/heads/regions Commit: 6b19086874c6354df59373c5b2d1e9310452f211 Parents: dfc9dc1 Author: Min Chen Authored: Fri Jan 25 14:18:25 2013 -0800 Committer: Sheng Yang Committed: Wed Jan 30 10:47:16 2013 -0800 ---------------------------------------------------------------------- .../com/cloud/api/query/dao/HostJoinDaoImpl.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/6b190868/server/src/com/cloud/api/query/dao/HostJoinDaoImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/api/query/dao/HostJoinDaoImpl.java b/server/src/com/cloud/api/query/dao/HostJoinDaoImpl.java index e842383..13b777a 100644 --- a/server/src/com/cloud/api/query/dao/HostJoinDaoImpl.java +++ b/server/src/com/cloud/api/query/dao/HostJoinDaoImpl.java @@ -77,7 +77,7 @@ public class HostJoinDaoImpl extends GenericDaoBase implements hostResponse.setCapabilities(host.getCapabilities()); hostResponse.setClusterId(host.getClusterUuid()); hostResponse.setCpuNumber(host.getCpus()); - hostResponse.setZoneId(host.getUuid()); + hostResponse.setZoneId(host.getZoneUuid()); hostResponse.setDisconnectedOn(host.getDisconnectedOn()); hostResponse.setHypervisor(host.getHypervisorType()); hostResponse.setHostType(host.getType());