[1.9.x] Fixed #26627 -- Fixed on_commit callbacks execution order when callbacks make transactions.

Backport of a5c8072ab1e56da368a40f3e9c9a3b465f4ffbae from master

1 files changed, 5 insertions, 6 deletions

diff --git a/django/db/backends/base/base.py b/django/db/backends/base/base.py
index 0356ab54cc..021fe0bafa 100644
--- a/django/db/backends/base/base.py
+++ b/django/db/backends/base/base.py
@@ -617,12 +617,11 @@ class BaseDatabaseWrapper(object):
 
     def run_and_clear_commit_hooks(self):
         self.validate_no_atomic_block()
-        try:
-            while self.run_on_commit:
-                sids, func = self.run_on_commit.pop(0)
-                func()
-        finally:
-            self.run_on_commit = []
+        current_run_on_commit = self.run_on_commit
+        self.run_on_commit = []
+        while current_run_on_commit:
+            sids, func = current_run_on_commit.pop(0)
+            func()
 
     def copy(self, alias=None, allow_thread_sharing=None):
         """