Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

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
  • Loading branch information...
commit 844089de076e357f6b62d75099a5bd21bf7c94e5 1 parent 54f9a98
Malcolm Tredinnick malcolmt authored
Showing with 4 additions and 1 deletion.
  1. +4 −1 django/db/__init__.py
5 django/db/__init__.py
View
@@ -53,5 +53,8 @@ def reset_queries(**kwargs):
# when a Django request has an exception.
def _rollback_on_exception(**kwargs):
from django.db import transaction
- transaction.rollback_unless_managed()
+ try:
+ transaction.rollback_unless_managed()
+ except DatabaseError:
+ pass
signals.got_request_exception.connect(_rollback_on_exception)
Please sign in to comment.
Something went wrong with that request. Please try again.