Updated Branches: refs/heads/network-refactor 95e63bc1c -> 6d41fe029
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/6d41fe02 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/6d41fe02 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/6d41fe02 Branch: refs/heads/network-refactor Commit: 6d41fe02966450d9f8f3bd098bdfd4e68c9a92ac Parents: 95e63bc Author: Sheng Yang <[email protected]> Authored: Wed Feb 6 13:57:31 2013 -0800 Committer: Sheng Yang <[email protected]> Committed: Wed Feb 6 13:57:31 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/6d41fe02/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 c003f6a..b9e364d 100755 --- a/server/src/com/cloud/vm/dao/UserVmDaoImpl.java +++ b/server/src/com/cloud/vm/dao/UserVmDaoImpl.java @@ -280,7 +280,9 @@ public class UserVmDaoImpl extends GenericDaoBase<UserVmVO, Long> implements Use NicDao _nicDao = ComponentLocator.getLocator("management-server").getDao(NicDao.class); 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);
