[Zodb-checkins] CVS: Zope2/lib/python/ZODB - Connection.py:1.43.2.6

[chrism@serenade.digicool.com]

Update of /cvs-repository/Zope2/lib/python/ZODB
In directory serenade.digicool.com:/home/chrism/sandboxes/cst08/lib/python/ZODB

Modified Files:
      Tag: zope-2_3-branch
	Connection.py 
Log Message:
Added exception handler for conflict error in setstate (better error messages this way).



--- Updated File Connection.py in package Zope2/lib/python/ZODB --
--- Connection.py	2001/03/28 20:52:47	1.43.2.5
+++ Connection.py	2001/04/02 14:47:45	1.43.2.6
@@ -548,11 +548,11 @@
                     get_transaction().register(self)
                     raise ConflictError(`oid`, `object.__class__`)
 
+        except ConflictError:
+            raise
         except:
-            t, v =sys.exc_info()[:2]
             LOG('ZODB',ERROR, "Couldn't load state for %s" % `oid`,
                 error=sys.exc_info())
-            raise
 
     def oldstate(self, object, serial):
         oid=object._p_oid