[Zodb-checkins] CVS: ZODB3/ZODB - Transaction.py:1.48

Jeremy Hylton jeremy@zope.com
Thu, 6 Mar 2003 19:11:13 -0500


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

Modified Files:
	Transaction.py 
Log Message:
Make the code follow the comment.

If an error occurs during tpc_finish, save the original exception just
in case something goes wrong while cleaning up the message. 


=== ZODB3/ZODB/Transaction.py 1.47 => 1.48 ===
--- ZODB3/ZODB/Transaction.py:1.47	Mon Jan 27 15:30:45 2003
+++ ZODB3/ZODB/Transaction.py	Thu Mar  6 19:11:10 2003
@@ -255,6 +255,7 @@
                 # have to clean up.  First save the original exception
                 # in case the cleanup process causes another
                 # exception.
+                error = sys.exc_info()
                 try:
                     self._commit_error(objects, ncommitted, jars, subjars)
                 except:
@@ -262,7 +263,7 @@
                         "A storage error occured during transaction "
                         "abort.  This shouldn't happen.",
                         error=sys.exc_info())
-                raise
+                raise error[0], error[1], error[2]
         finally:
             del objects[:] # clear registered
             if not subtransaction and self._id is not None: