Updated Branches: refs/heads/4.1 00b2a99e7 -> 17212984c
IPv6: CLOUDSTACK-1141: Fix reboot router with IPv6 assigned VM Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/17212984 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/17212984 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/17212984 Branch: refs/heads/4.1 Commit: 17212984c909b13e982a29c5a7e1f35a636fe5da Parents: 00b2a99 Author: Sheng Yang <[email protected]> Authored: Wed Feb 6 13:57:31 2013 -0800 Committer: Sheng Yang <[email protected]> Committed: Wed Feb 6 13:59:14 2013 -0800 ---------------------------------------------------------------------- server/src/com/cloud/vm/dao/UserVmDaoImpl.java | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/17212984/server/src/com/cloud/vm/dao/UserVmDaoImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/vm/dao/UserVmDaoImpl.java b/server/src/com/cloud/vm/dao/UserVmDaoImpl.java index 93780b1..f2fc10b 100755 --- a/server/src/com/cloud/vm/dao/UserVmDaoImpl.java +++ b/server/src/com/cloud/vm/dao/UserVmDaoImpl.java @@ -285,7 +285,9 @@ public class UserVmDaoImpl extends GenericDaoBase<UserVmVO, Long> implements Use if (UserVmSearch == null) { SearchBuilder<NicVO> nicSearch = _nicDao.createSearchBuilder(); nicSearch.and("networkId", nicSearch.entity().getNetworkId(), SearchCriteria.Op.EQ); - nicSearch.and("ip4Address", nicSearch.entity().getIp4Address(), SearchCriteria.Op.NNULL); + nicSearch.and().op("ip4Address", nicSearch.entity().getIp4Address(), SearchCriteria.Op.NNULL); + nicSearch.or("ip6Address", nicSearch.entity().getIp6Address(), SearchCriteria.Op.NNULL); + nicSearch.cp(); UserVmSearch = createSearchBuilder(); UserVmSearch.and("states", UserVmSearch.entity().getState(), SearchCriteria.Op.IN);
