Updated Branches: refs/heads/network-refactor f1c1241e6 -> 0ea19fc2a
Fix a typo CanUseForDeploy() didn't return correct result due to this Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/0ea19fc2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/0ea19fc2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/0ea19fc2 Branch: refs/heads/network-refactor Commit: 0ea19fc2aa06c64bfb4375f8ced471c99fbbc61f Parents: 931372e Author: Sheng Yang <[email protected]> Authored: Fri Feb 8 14:19:24 2013 -0800 Committer: Sheng Yang <[email protected]> Committed: Fri Feb 8 14:48:54 2013 -0800 ---------------------------------------------------------------------- .../cloud/network/dao/UserIpv6AddressDaoImpl.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/0ea19fc2/server/src/com/cloud/network/dao/UserIpv6AddressDaoImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/network/dao/UserIpv6AddressDaoImpl.java b/server/src/com/cloud/network/dao/UserIpv6AddressDaoImpl.java index d1e541e..b811a30 100644 --- a/server/src/com/cloud/network/dao/UserIpv6AddressDaoImpl.java +++ b/server/src/com/cloud/network/dao/UserIpv6AddressDaoImpl.java @@ -41,7 +41,7 @@ public class UserIpv6AddressDaoImpl extends GenericDaoBase<UserIpv6AddressVO, Lo CountFreePublicIps = createSearchBuilder(Long.class); CountFreePublicIps.select(null, Func.COUNT, null); CountFreePublicIps.and("networkId", CountFreePublicIps.entity().getSourceNetworkId(), SearchCriteria.Op.EQ); - CountFreePublicIps.and("vlanId", CountFreePublicIps.entity().getSourceNetworkId(), SearchCriteria.Op.EQ); + CountFreePublicIps.and("vlanId", CountFreePublicIps.entity().getVlanId(), SearchCriteria.Op.EQ); CountFreePublicIps.done(); }
