You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by de...@apache.org on 2013/06/28 00:12:52 UTC

git commit: updated refs/heads/master-6-17-stable to b5a16cd

Updated Branches:
  refs/heads/master-6-17-stable fc357e983 -> b5a16cda0


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/b5a16cda
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b5a16cda
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b5a16cda

Branch: refs/heads/master-6-17-stable
Commit: b5a16cda0c0382ffbaafd3a39379be7112ef1dc6
Parents: fc357e9
Author: Devdeep Singh <de...@gmail.com>
Authored: Thu Jun 27 08:16:54 2013 -0700
Committer: Devdeep Singh <de...@gmail.com>
Committed: Fri Jun 28 03:45:08 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/b5a16cda/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<PortableIpVO, Long> 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();