incubator-cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yas...@apache.org
Subject git commit: refs/heads/master - IPv6: CLOUDSTACK-1141: Fix reboot router with IPv6 assigned VM
Date Wed, 06 Feb 2013 22:00:10 GMT
Updated Branches:
  refs/heads/master 5af6d16c5 -> 3d1989c10


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/master
Commit: 3d1989c10301978af4ba68f093138cfbe42de63b
Parents: 5af6d16
Author: Sheng Yang <sheng.yang@citrix.com>
Authored: Wed Feb 6 13:57:31 2013 -0800
Committer: Sheng Yang <sheng.yang@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);


Mime
View raw message