[Zope-Checkins] CVS: Zope2 - Connection.py:1.43.2.4

[Jim Fulton]

Update of /cvs-repository/Zope2/lib/python/ZODB
In directory korak:/tmp/cvs-serv6603

Modified Files:
      Tag: zope-2_3-branch
	Connection.py 
Log Message:
Added check for conflict resolution in defered return of serial
numbers.



--- Updated File Connection.py in package Zope2 --
--- Connection.py	2001/03/15 13:10:35	1.43.2.3
+++ Connection.py	2001/03/20 03:57:46	1.43.2.4
@@ -391,11 +391,17 @@
                         if _type(s) is not _st: raise s
                         o=get(oi, oi)
                         if o is not oi:
-                            o._p_serial=s
-                            o._p_changed=0
+                            if s is ResolvedSerial:
+                                o._p_changed=None
+                            else:
+                                o._p_serial=s
+                                o._p_changed=0
                         elif oi == oid:
-                            object._p_serial=s
-                            object._p_changed=0
+                            if s is ResolvedSerial:
+                                object._p_changed=None
+                            else:
+                                object._p_serial=s
+                                object._p_changed=0
 
             try: cache[oid]=object
             except:
@@ -624,8 +630,11 @@
                 o=get(oid, oid)
                 if o is not oid:
                     if _type(s) is not _st: raise s
-                    o._p_serial=s
-                    o._p_changed=0
+                    if s is ResolvedSerial:
+                        o._p_changed=None
+                    else:
+                        o._p_serial=s
+                        o._p_changed=0
         
 
     def tpc_finish(self, transaction):