[Zodb-checkins] CVS: Packages/ZEO - ClientStorage.py:1.27

[Jim Fulton]

Update of /cvs-repository/Packages/ZEO
In directory korak:/tmp/cvs-serv13271

Modified Files:
	ClientStorage.py 
Log Message:
Added logic to support conflict resolution.



--- Updated File ClientStorage.py in package Packages/ZEO --
--- ClientStorage.py	2001/01/11 21:52:02	1.26
+++ ClientStorage.py	2001/04/02 21:34:01	1.27
@@ -96,6 +96,9 @@
 from ZODB.TimeStamp import TimeStamp
 from zLOG import LOG, PROBLEM, INFO
 
+try: from ZODB.ConflictResolution import ResolvedSerial
+except: ResolvedSerial='rs'
+
 TupleType=type(())
 
 class ClientStorageError(POSException.StorageError):
@@ -517,7 +520,10 @@
                         "Unexpected end of file in client storage "
                         "temporary file."
                         )
-                update(oid, s, v, p)
+                if s==ResolvedSerial:
+                    cache.invalidate(oid, v)
+                else:
+                    update(oid, s, v, p)
                 i=i+14+vlen+dlen
 
             seek(0)