[Zodb-checkins] SVN: ZODB/branches/3.6/ LP #142667: ensure _reader uses new cache in _resetCache.

[Tres Seaver]

Log message for revision 91952:
  LP #142667:  ensure _reader uses new cache in _resetCache.

Changed:
  U   ZODB/branches/3.6/NEWS.txt
  U   ZODB/branches/3.6/src/ZODB/Connection.py
  U   ZODB/branches/3.6/src/ZODB/tests/testConnection.py

-=-
Modified: ZODB/branches/3.6/NEWS.txt
===================================================================
--- ZODB/branches/3.6/NEWS.txt	2008-10-10 02:17:45 UTC (rev 91951)
+++ ZODB/branches/3.6/NEWS.txt	2008-10-10 02:18:38 UTC (rev 91952)
@@ -1,3 +1,16 @@
+What's new in ZODB3 3.6.4?
+==========================
+Release date: DD-MMM-YYYY
+
+Connection
+----------
+
+- (3.6.4) Reset ``_cache`` on a connection's ``_reader`` object when
+  resetting the cache, to prevent reads from the old cache object, e.g.
+  during Zope2's auto-refresh of products.
+  (https://bugs.launchpad.net/zodb/+bug/142667).
+
+
 What's new in ZODB3 3.6.3?
 ==========================
 Release date: 03-Jul-2007
@@ -2,4 +15,2 @@
 
-
-
 Following is combined news from internal releases (to support ongoing

Modified: ZODB/branches/3.6/src/ZODB/Connection.py
===================================================================
--- ZODB/branches/3.6/src/ZODB/Connection.py	2008-10-10 02:17:45 UTC (rev 91951)
+++ ZODB/branches/3.6/src/ZODB/Connection.py	2008-10-10 02:18:38 UTC (rev 91952)
@@ -961,6 +961,8 @@
         self._invalidated.clear()
         cache_size = self._cache.cache_size
         self._cache = cache = PickleCache(self, cache_size)
+        if getattr(self, '_reader', None) is not None:
+            self._reader._cache = cache
 
     ##########################################################################
     # Python protocol

Modified: ZODB/branches/3.6/src/ZODB/tests/testConnection.py
===================================================================
--- ZODB/branches/3.6/src/ZODB/tests/testConnection.py	2008-10-10 02:17:45 UTC (rev 91951)
+++ ZODB/branches/3.6/src/ZODB/tests/testConnection.py	2008-10-10 02:18:38 UTC (rev 91952)
@@ -146,6 +146,14 @@
         self.datamgr.tpc_finish(self.transaction)
         self.assert_(obj._p_oid not in self.datamgr._storage._stored)
 
+    def check__resetCacheResetsReader(self):
+        # https://bugs.launchpad.net/zodb/+bug/142667
+        old_cache = self.datamgr._cache
+        self.datamgr._resetCache()
+        new_cache = self.datamgr._cache
+        self.failIf(new_cache is old_cache)
+        self.failUnless(self.datamgr._reader._cache is new_cache)
+
 class UserMethodTests(unittest.TestCase):
 
     # add isn't tested here, because there are a bunch of traditional