commit b7170fe3fe0d8933de57968222bab95ef6615a5a
author Sergio Giro <sgiro@google.com> Tue Nov 17 11:52:05 2015 +0000
committer Sergio Giro <sgiro@google.com> Fri Nov 20 14:54:51 2015 +0000
tree e1fd6a4da9c56edc6c49d753549659f8be602fb2
parent 1337349ea11a6bb5c44ba5c5bb064c750bd626c5

libutils: fix cache removal when callback invalidates the key

Bug: 24785286
Change-Id: I9d17d2247258a56ef7776b3a701389e825a9c533

include/utils/LruCache.h

diff --git a/include/utils/LruCache.h b/include/utils/LruCache.h
index 1741fb2..ed96fe4 100644
--- a/include/utils/LruCache.h
+++ b/include/utils/LruCache.h
@@ -200,11 +200,11 @@
         return false;
     }
     Entry* entry = *find_result;
+    mSet->erase(entry);
     if (mListener) {
         (*mListener)(entry->key, entry->value);
     }
     detachFromCache(*entry);
-    mSet->erase(entry);
     delete entry;
     return true;
 }