You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by da...@apache.org on 2014/06/06 13:44:24 UTC
[2/3] git commit: updated refs/heads/4.4 to 0b08d53
CLOUDSTACK-6853: Search for non-removed nics only when check if the running vm belongs to a certain network
(cherry picked from commit 03623fe57e6597782b628815140283151d066a36)
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e6c37ffd
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e6c37ffd
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e6c37ffd
Branch: refs/heads/4.4
Commit: e6c37ffd4127534e3d72b21f989121ba78368353
Parents: 11d8c95
Author: Alena Prokharchyk <al...@citrix.com>
Authored: Thu Jun 5 17:07:52 2014 -0700
Committer: Daan Hoogland <da...@onecht.net>
Committed: Fri Jun 6 13:42:12 2014 +0200
----------------------------------------------------------------------
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/e6c37ffd/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();