Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 15E1E107D7 for ; Thu, 27 Jun 2013 22:00:35 +0000 (UTC) Received: (qmail 59875 invoked by uid 500); 27 Jun 2013 22:00:35 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 59855 invoked by uid 500); 27 Jun 2013 22:00:34 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 59848 invoked by uid 99); 27 Jun 2013 22:00:34 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 27 Jun 2013 22:00:34 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id A80E238C96; Thu, 27 Jun 2013 22:00:34 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: devdeep@apache.org To: commits@cloudstack.apache.org Message-Id: <0c09186f1fb64b82a819f6ed22b98b20@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: updated refs/heads/master to 4bbc65b Date: Thu, 27 Jun 2013 22:00:34 +0000 (UTC) Updated Branches: refs/heads/master 7e44f8127 -> 4bbc65b34 CLOUDSTACK-3246: Unable to use portable ips if the portable ip range is deleted and readded atleast once. Fixed the query used to look for available portable ips. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/4bbc65b3 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/4bbc65b3 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/4bbc65b3 Branch: refs/heads/master Commit: 4bbc65b34ca1bd2a387161badadc8aea25d74020 Parents: 7e44f81 Author: Devdeep Singh Authored: Thu Jun 27 08:16:54 2013 -0700 Committer: Devdeep Singh Committed: Fri Jun 28 03:32:31 2013 +0530 ---------------------------------------------------------------------- server/src/org/apache/cloudstack/region/PortableIpDaoImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4bbc65b3/server/src/org/apache/cloudstack/region/PortableIpDaoImpl.java ---------------------------------------------------------------------- diff --git a/server/src/org/apache/cloudstack/region/PortableIpDaoImpl.java b/server/src/org/apache/cloudstack/region/PortableIpDaoImpl.java index 488761b..4e1810f 100755 --- a/server/src/org/apache/cloudstack/region/PortableIpDaoImpl.java +++ b/server/src/org/apache/cloudstack/region/PortableIpDaoImpl.java @@ -69,7 +69,7 @@ public class PortableIpDaoImpl extends GenericDaoBase implem listByRangeIDAndStateSearch.done(); listByRegionIDAndStateSearch = createSearchBuilder(); - listByRegionIDAndStateSearch.and("regionId", listByRegionIDAndStateSearch.entity().getRangeId(), SearchCriteria.Op.EQ); + listByRegionIDAndStateSearch.and("regionId", listByRegionIDAndStateSearch.entity().getRegionId(), SearchCriteria.Op.EQ); listByRegionIDAndStateSearch.and("state", listByRegionIDAndStateSearch.entity().getState(), SearchCriteria.Op.EQ); listByRegionIDAndStateSearch.done();