From 0e39d542c3f68044fa191d23461e1521f2f32d50 Mon Sep 17 00:00:00 2001 From: Christos Tsantilas Date: Fri, 20 Jun 2014 22:21:13 -0600 Subject: [PATCH] Assure that when LruMap::memLimit_ is set to 0 no entries stored on LruMap Changes: - Do not add new entries to LruMap if memLimit is 0 - Remove all entries in LruMap::trim if memLimit set to 0 --- src/base/LruMap.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/base/LruMap.h b/src/base/LruMap.h index c558666812..64211919b4 100644 --- a/src/base/LruMap.h +++ b/src/base/LruMap.h @@ -143,6 +143,10 @@ LruMap::add(const char *key, EntryValue *t) del(key); trim(); + + if (memLimit() == 0) + return false; + index.push_front(new Entry(key, t)); storage.insert(MapPair(key, index.begin())); @@ -188,7 +192,7 @@ template void LruMap::trim() { - while (memLimit() > 0 && size() >= memLimit()) { + while (size() >= memLimit()) { QueueIterator i = index.end(); --i; if (i != index.end()) { -- 2.47.2