[Zodb-checkins] CVS: ZODB3/ZODB - ConflictResolution.py:1.18

[Jeremy Hylton]

Update of /cvs-repository/ZODB3/ZODB
In directory cvs.zope.org:/tmp/cvs-serv2108

Modified Files:
	ConflictResolution.py 
Log Message:
Exit early if load_class() fails.


=== ZODB3/ZODB/ConflictResolution.py 1.17 => 1.18 ===
--- ZODB3/ZODB/ConflictResolution.py:1.17	Tue Dec  3 13:36:29 2002
+++ ZODB3/ZODB/ConflictResolution.py	Mon Dec  9 17:31:19 2002
@@ -95,6 +95,8 @@
             return None
         newstate = unpickler.load()
         klass = load_class(class_tuple)
+        if klass is None:
+            return None
         inst = klass.__basicnew__()
 
         try: