You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bf...@apache.org on 2013/02/07 21:04:12 UTC
[30/51] [abbrv] git commit: refs/heads/ui-plugins - IPv6:
CLOUDSTACK-1141: Fix reboot router with IPv6 assigned VM
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/3d1989c1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/3d1989c1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/3d1989c1
Branch: refs/heads/ui-plugins
Commit: 3d1989c10301978af4ba68f093138cfbe42de63b
Parents: 5af6d16
Author: Sheng Yang <sh...@citrix.com>
Authored: Wed Feb 6 13:57:31 2013 -0800
Committer: Sheng Yang <sh...@citrix.com>
Committed: Wed Feb 6 13:59:53 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/3d1989c1/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);