Fixed #11900 -- Corrected an edge case of transaction handling in the commit_on_success decorator. Thanks to guettli for the report, and Gabriel Hurley for the initial test case.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@12764 bcc190cf-cafb-0310-a4f2-bffc1f526a37

1 files changed, 5 insertions, 1 deletions

diff --git a/django/db/transaction.py b/django/db/transaction.py
index 6cd078d94d..31d717f4d2 100644
--- a/django/db/transaction.py
+++ b/django/db/transaction.py
@@ -304,7 +304,11 @@ def commit_on_success(using=None):
                     raise
                 else:
                     if is_dirty(using=db):
-                        commit(using=db)
+                        try:
+                            commit(using=db)
+                        except:
+                            rollback(using=db)
+                            raise
                 return res
             finally:
                 leave_transaction_management(using=db)