From 6e399aa698088ada84b4fa2df8546f6626065719 Mon Sep 17 00:00:00 2001
From: alena <alena@cloud.com>
Date: Mon, 7 Feb 2011 09:54:59 -0800
Subject: [PATCH] Vm expunge: when delete port forwarding rules as a part of vm
 expunge, do searchIncludingRemoved for the vm because vm can be marked for
 removal already.

---
 server/src/com/cloud/network/rules/RulesManagerImpl.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/src/com/cloud/network/rules/RulesManagerImpl.java b/server/src/com/cloud/network/rules/RulesManagerImpl.java
index 17011b88f3e..480860330a4 100644
--- a/server/src/com/cloud/network/rules/RulesManagerImpl.java
+++ b/server/src/com/cloud/network/rules/RulesManagerImpl.java
@@ -377,7 +377,7 @@ public class RulesManagerImpl implements RulesManager, RulesService, Manager {
     
     @Override
     public boolean revokePortForwardingRule(long vmId) {
-    	UserVmVO vm = _vmDao.findById(vmId);
+    	UserVmVO vm = _vmDao.findByIdIncludingRemoved(vmId);
     	if (vm == null) {
     		return false;
     	}