p15693087
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed #8315 -- If an exception is raised whilst trying to rollback a 

transaction (after another exception in the code), make sure the original
exception is reported, rather than the rollback-generated one. The latter is
almost certainly a consequence of the former. Patch from Karen Tracey.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8411 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Malcolm Tredinnick 2008-08-16 15:58:30 +00:00
parent 54f9a98713
commit 844089de07
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
django/db/__init__.py
View File

@ -53,5 +53,8 @@ signals.request_started.connect(reset_queries)
# when a Django request has an exception. # when a Django request has an exception.
def _rollback_on_exception(**kwargs): def _rollback_on_exception(**kwargs):
from django.db import transaction from django.db import transaction
try:
transaction.rollback_unless_managed() transaction.rollback_unless_managed()
except DatabaseError:
pass
signals.got_request_exception.connect(_rollback_on_exception) signals.got_request_exception.connect(_rollback_on_exception)