From 696440a6754a60888fce7a82e8022ca7278b9be5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Aur=C3=A8le=20Brothier?= <m@brothier.org>
Date: Wed, 4 May 2016 14:28:44 +0200
Subject: [PATCH] dao: Hit the cache for entity flagged as removed too since
 they are put in cache afterwards.

---
 framework/db/src/com/cloud/utils/db/GenericDaoBase.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/framework/db/src/com/cloud/utils/db/GenericDaoBase.java b/framework/db/src/com/cloud/utils/db/GenericDaoBase.java
index 29adbe257a9..2de161b457c 100644
--- a/framework/db/src/com/cloud/utils/db/GenericDaoBase.java
+++ b/framework/db/src/com/cloud/utils/db/GenericDaoBase.java
@@ -969,7 +969,12 @@ public abstract class GenericDaoBase<T, ID extends Serializable> extends Compone
     @Override
     @DB()
     public T findByIdIncludingRemoved(ID id) {
-        return findById(id, true, null);
+        if (_cache != null) {
+            final Element element = _cache.get(id);
+            return element == null ? findById(id, true, null) : (T)element.getObjectValue();
+        } else {
+            return findById(id, true, null);
+        }
     }
 
     @Override