[Zope-CVS] CVS: Products/Ape/lib/apelib/zodb3 - connection.py:1.8.2.1

Shane Hathaway shane at zope.com
Thu Feb 26 10:09:45 EST 2004


Update of /cvs-repository/Products/Ape/lib/apelib/zodb3
In directory cvs.zope.org:/tmp/cvs-serv29299/zodb3

Modified Files:
      Tag: ape-fs-oid-branch
	connection.py 
Log Message:
Removed the cache clearing hack.

It was a workaround for the effects of meaningful OIDs, but now that
OIDs are arbitrary, the workaround isn't needed.


=== Products/Ape/lib/apelib/zodb3/connection.py 1.8 => 1.8.2.1 ===
--- Products/Ape/lib/apelib/zodb3/connection.py:1.8	Tue Feb 17 00:25:13 2004
+++ Products/Ape/lib/apelib/zodb3/connection.py	Thu Feb 26 10:09:45 2004
@@ -293,14 +293,6 @@
             # response, just in case the response contains the
             # serial number for a newly created object
             try: cache[oid] = obj
-            except ValueError:
-                # "Cannot re-register an object under a different
-                # oid".  This can happen when the user is working on
-                # the filesystem and creates an object with an ID that
-                # was used recently.  Try to fix it by minimizing
-                # the cache and trying again.
-                cache.minimize()
-                cache[oid] = obj
             except:
                 if aq_base(obj) is not obj:
                     # Yuck, someone tried to store a wrapper.  Try to




More information about the Zope-CVS mailing list