cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alena1...@apache.org
Subject [1/2] git commit: updated refs/heads/4.4-forward to 66df435
Date Fri, 06 Jun 2014 00:43:35 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/4.4-forward 9b9154132 -> 66df43572


CLOUDSTACK-6853: Search for non-removed nics only when check if the running vm belongs to
a certain network


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/03623fe5
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/03623fe5
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/03623fe5

Branch: refs/heads/4.4-forward
Commit: 03623fe57e6597782b628815140283151d066a36
Parents: 9b91541
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Authored: Thu Jun 5 17:07:52 2014 -0700
Committer: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Committed: Thu Jun 5 17:07:52 2014 -0700

----------------------------------------------------------------------
 engine/schema/src/com/cloud/vm/dao/UserVmDaoImpl.java | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/03623fe5/engine/schema/src/com/cloud/vm/dao/UserVmDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/vm/dao/UserVmDaoImpl.java b/engine/schema/src/com/cloud/vm/dao/UserVmDaoImpl.java
index 7a05be8..f72690e 100755
--- a/engine/schema/src/com/cloud/vm/dao/UserVmDaoImpl.java
+++ b/engine/schema/src/com/cloud/vm/dao/UserVmDaoImpl.java
@@ -297,6 +297,7 @@ 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("removed", nicSearch.entity().getRemoved(), SearchCriteria.Op.NULL);
             nicSearch.and().op("ip4Address", nicSearch.entity().getIp4Address(), SearchCriteria.Op.NNULL);
             nicSearch.or("ip6Address", nicSearch.entity().getIp6Address(), SearchCriteria.Op.NNULL);
             nicSearch.cp();


Mime
View raw message