util.cache (and tests): Call on_evict after insertion of the new key, so inside on_ev...

[prosody.git] / util / cache.lua

diff --git a/util/cache.lua b/util/cache.lua
index 72b74351a37733e2374abb6b0a5b602043ff3f71..d3639b3f7aebc791bfdf8b57d395af810b03e25e 100644 (file)
--- a/util/cache.lua
+++ b/util/cache.lua
@@ -51,19 +51,20 @@ function cache_methods:set(k, v)
                return true;
        end
        -- Check whether we need to remove oldest k/v
+       local on_evict, evicted_key, evicted_value;
        if self._count == self.size then
                local tail = self._tail;
-               local on_evict = self._on_evict;
-               if on_evict then
-                       on_evict(tail.key, tail.value);
-               end
+               on_evict, evicted_key, evicted_value = self._on_evict, tail.key, tail.value;
                _remove(self, tail);
-               self._data[tail.key] = nil;
+               self._data[evicted_key] = nil;
        end
 
        m = { key = k, value = v, prev = nil, next = nil };
        self._data[k] = m;
        _insert(self, m);
+       if on_evict and evicted_key then
+               on_evict(evicted_key, evicted_value, self);
+       end
        return true;
 end