From f2921b7f152fd07b9178dfc30147d1802cda9e83 Mon Sep 17 00:00:00 2001
From: alena <alena@cloud.com>
Date: Mon, 4 Apr 2011 15:15:21 -0700
Subject: [PATCH] bug 9272: fixed the race condition bug when we tried to
 remove vm from SG after it was expunged (expunge interval was really small,
 60 sec). status 9272: resolved fixed

When do search for vm, do includingRemoved search.
---
 .../com/cloud/network/security/SecurityGroupManagerImpl.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/src/com/cloud/network/security/SecurityGroupManagerImpl.java b/server/src/com/cloud/network/security/SecurityGroupManagerImpl.java
index f4e723296d0..d18387787ce 100644
--- a/server/src/com/cloud/network/security/SecurityGroupManagerImpl.java
+++ b/server/src/com/cloud/network/security/SecurityGroupManagerImpl.java
@@ -1337,7 +1337,7 @@ public class SecurityGroupManagerImpl implements SecurityGroupManager, SecurityG
 
     @Override
     public boolean isVmSecurityGroupEnabled(Long vmId) {
-        VirtualMachine vm = _vmDao.findById(vmId);
+        VirtualMachine vm = _vmDao.findByIdIncludingRemoved(vmId);
         List<NicProfile> nics = _networkMgr.getNicProfiles(vm);
         for (NicProfile nic : nics) {
             if (nic.isSecurityGroupEnabled() && vm.getHypervisorType() != HypervisorType.VMware) {