diff options
| author | Jacob Kaplan-Moss <jacob@jacobian.org> | 2009-04-01 17:06:20 +0000 |
|---|---|---|
| committer | Jacob Kaplan-Moss <jacob@jacobian.org> | 2009-04-01 17:06:20 +0000 |
| commit | 34e823a699ff21c3780f2bcc52ca0cc7b50931a6 (patch) | |
| tree | 336d8a084d8cf7905816d123ae36ce9868791282 | |
| parent | 6efe30672d51909f63f0187675cb09ceac4f135e (diff) | |
[1.0.X] Fixed #9644: fix a thread sync issue in the locmem cache. Thanks, mrts. Backport of r10333 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10334 bcc190cf-cafb-0310-a4f2-bffc1f526a37
| -rw-r--r-- | django/core/cache/backends/locmem.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/django/core/cache/backends/locmem.py b/django/core/cache/backends/locmem.py index b34ce0595c..91e2f2f8da 100644 --- a/django/core/cache/backends/locmem.py +++ b/django/core/cache/backends/locmem.py @@ -58,8 +58,11 @@ class CacheClass(BaseCache): self._lock.reader_leaves() self._lock.writer_enters() try: - del self._cache[key] - del self._expire_info[key] + try: + del self._cache[key] + del self._expire_info[key] + except KeyError: + pass return default finally: self._lock.writer_leaves() |
