Updated Branches: refs/heads/master 57dc52bb6 -> ae231444b
Fix problems found in local test when JVM assertion is turned on Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/f383656b Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f383656b Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f383656b Branch: refs/heads/master Commit: f383656b216fca9706f459e178f232a5329b2be6 Parents: 249e2e8 Author: Kelven Yang <[email protected]> Authored: Wed Jul 31 16:25:36 2013 -0700 Committer: Kelven Yang <[email protected]> Committed: Wed Sep 4 14:49:44 2013 -0700 ---------------------------------------------------------------------- engine/schema/src/com/cloud/dc/dao/VlanDaoImpl.java | 2 +- server/src/com/cloud/network/NetworkManagerImpl.java | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f383656b/engine/schema/src/com/cloud/dc/dao/VlanDaoImpl.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/com/cloud/dc/dao/VlanDaoImpl.java b/engine/schema/src/com/cloud/dc/dao/VlanDaoImpl.java index eb3bde9..6f5a01f 100755 --- a/engine/schema/src/com/cloud/dc/dao/VlanDaoImpl.java +++ b/engine/schema/src/com/cloud/dc/dao/VlanDaoImpl.java @@ -347,7 +347,7 @@ public class VlanDaoImpl extends GenericDaoBase<VlanVO, Long> implements VlanDao @Override public List<VlanVO> listZoneWideNonDedicatedVlans(long zoneId) { SearchCriteria<VlanVO> sc = ZoneWideNonDedicatedVlanSearch.create(); - sc.setParameters("ZoneWideNonDedicatedVlanSearch", "zoneId", zoneId); + sc.setParameters("zoneId", zoneId); return listBy(sc); } http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f383656b/server/src/com/cloud/network/NetworkManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/network/NetworkManagerImpl.java b/server/src/com/cloud/network/NetworkManagerImpl.java index 7feeb14..7ccb769 100755 --- a/server/src/com/cloud/network/NetworkManagerImpl.java +++ b/server/src/com/cloud/network/NetworkManagerImpl.java @@ -576,6 +576,8 @@ public class NetworkManagerImpl extends ManagerBase implements NetworkManager, L AssignIpAddressFromPodVlanSearch = _ipAddressDao.createSearchBuilder(); AssignIpAddressFromPodVlanSearch.and("dc", AssignIpAddressFromPodVlanSearch.entity().getDataCenterId(), Op.EQ); AssignIpAddressFromPodVlanSearch.and("allocated", AssignIpAddressFromPodVlanSearch.entity().getAllocatedTime(), Op.NULL); + AssignIpAddressFromPodVlanSearch.and("vlanId", AssignIpAddressFromPodVlanSearch.entity().getVlanId(), Op.IN); + SearchBuilder<VlanVO> podVlanSearch = _vlanDao.createSearchBuilder(); podVlanSearch.and("type", podVlanSearch.entity().getVlanType(), Op.EQ); podVlanSearch.and("networkId", podVlanSearch.entity().getNetworkId(), Op.EQ); @@ -583,6 +585,8 @@ public class NetworkManagerImpl extends ManagerBase implements NetworkManager, L podVlanMapSB.and("podId", podVlanMapSB.entity().getPodId(), Op.EQ); AssignIpAddressFromPodVlanSearch.join("podVlanMapSB", podVlanMapSB, podVlanMapSB.entity().getVlanDbId(), AssignIpAddressFromPodVlanSearch.entity().getVlanId(), JoinType.INNER); AssignIpAddressFromPodVlanSearch.join("vlan", podVlanSearch, podVlanSearch.entity().getId(), AssignIpAddressFromPodVlanSearch.entity().getVlanId(), JoinType.INNER); + + AssignIpAddressFromPodVlanSearch.done(); _executor = Executors.newScheduledThreadPool(1, new NamedThreadFactory("Network-Scavenger"));
