Merge "Avoid calling callbacks while holding locks"

2014-03-14 19:29:25 +00:00
parent f00f1c358e d440972d10
commit 15bc29b3e7
1 changed files with 4 additions and 3 deletions
--- a/taskflow/engines/worker_based/cache.py
+++ b/taskflow/engines/worker_based/cache.py
@@ -51,7 +51,8 @@ class Cache(object):
        with self._lock.write_lock():
            expired_values = [(k, v) for k, v in six.iteritems(self._data)
                              if v.expired]
-            for k, v in expired_values:
-                if on_expired_callback:
-                    on_expired_callback(v)
+            for (k, _v) in expired_values:
                self._data.pop(k, None)
+        if on_expired_callback:
+            for (_k, v) in expired_values:
+                on_expired_callback(v)