[Zope-Checkins] CVS: ZODB3/ZODB - ConflictResolution.py:1.14.2.3

[Jeremy Hylton]

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

Modified Files:
      Tag: ZODB3-3_1-branch
	ConflictResolution.py 
Log Message:
load_class() returns None on error


=== ZODB3/ZODB/ConflictResolution.py 1.14.2.2 => 1.14.2.3 ===
--- ZODB3/ZODB/ConflictResolution.py:1.14.2.2	Tue Nov 12 15:18:09 2002
+++ ZODB3/ZODB/ConflictResolution.py	Mon Dec  9 17:30:33 2002
@@ -95,6 +95,8 @@
             return 0
         newstate = unpickler.load()
         klass = load_class(class_tuple)
+        if klass is None:
+            return 0
         inst = klass.__basicnew__()
 
         try: