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/4da47c2f Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/4da47c2f Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/4da47c2f Branch: refs/heads/4.1 Commit: 4da47c2ffd9464f9afa1327ce47fc9741ff9cb45 Parents: b586072 Author: Sheng Yang <[email protected]> Authored: Fri Feb 8 14:19:24 2013 -0800 Committer: Sheng Yang <[email protected]> Committed: Fri Feb 8 14:41:58 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/4da47c2f/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 587193c..c9f38ec 100644 --- a/server/src/com/cloud/network/dao/UserIpv6AddressDaoImpl.java +++ b/server/src/com/cloud/network/dao/UserIpv6AddressDaoImpl.java @@ -59,7 +59,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(); }
