[Zodb-checkins] CVS: Packages/ZODB - Connection.py:1.98.4.8

[Tim Peters]

Update of /cvs-repository/Packages/ZODB
In directory cvs.zope.org:/tmp/cvs-serv28070/lib/python/ZODB

Modified Files:
      Tag: Zope-2_7-branch
	Connection.py 
Log Message:
commit():  If an oid is self._conflicts, don't register it with the
transaction.  It must surely be registered already, else commit() wouldn't
have been called to begin with.


=== Packages/ZODB/Connection.py 1.98.4.7 => 1.98.4.8 ===
--- Packages/ZODB/Connection.py:1.98.4.7	Fri Aug 27 15:03:42 2004
+++ Packages/ZODB/Connection.py	Tue Aug 31 18:07:21 2004
@@ -105,7 +105,7 @@
         # committed subtransaction is pending.  For "top level" pending
         # changes, we set _object_registered to True in register(), and
         # back to False in abort() and _flush_invalidations().  The latter
-        # is an odd choice, but is common to most ways of clearing pending 
+        # is an odd choice, but is common to most ways of clearing pending
         # top-level change (tpc_finish, tpc_abort, sync, _setDB).  abort()
         # is also a bit peculiar, but it's the only Connection method
         # Transaction.abort() calls, so there's not much choice.
@@ -336,7 +336,6 @@
 
         oid = object._p_oid
         if self._conflicts.has_key(oid):
-            self.getTransaction().register(object)
             raise ReadConflictError(object=object)
 
         invalid = self._invalid