[Zope3-checkins] CVS: Zope3/src/zodb - conflict.py:1.5

[Jeremy Hylton]

Update of /cvs-repository/Zope3/src/zodb
In directory cvs.zope.org:/tmp/cvs-serv19704/src/zodb

Modified Files:
	conflict.py 
Log Message:
Don't catch ConflictError here, let it percolate up to the app.


=== Zope3/src/zodb/conflict.py 1.4 => 1.5 ===
--- Zope3/src/zodb/conflict.py:1.4	Fri Jan 10 16:18:50 2003
+++ Zope3/src/zodb/conflict.py	Wed Jan 15 14:07:22 2003
@@ -158,10 +158,7 @@
         except (EOFError, PicklingError), err:
             logging.warn("CR: Error loading object: %s", err)
             return None
-        try:
-            resolved = resolve(old, committed, newstate)
-        except ConflictError:
-            return None
+        resolved = resolve(old, committed, newstate)
 
         writer = ResolvedObjectWriter()
         obj = ResolvedObjectAdapter(get_self(resolve), resolved)