Author: russellm
Date: 2010-02-11 07:10:52 -0600 (Thu, 11 Feb 2010)
New Revision: 12413

Modified:
   django/branches/releases/1.1.X/django/core/cache/backends/db.py
Log:
[1.1.X] Fixed #12189 -- Corrected rollback behavior in database cache backend. 
Thanks to Lakin Wecker for the report.

Backport of r12409 from trunk.

Modified: django/branches/releases/1.1.X/django/core/cache/backends/db.py
===================================================================
--- django/branches/releases/1.1.X/django/core/cache/backends/db.py     
2010-02-11 13:09:56 UTC (rev 12412)
+++ django/branches/releases/1.1.X/django/core/cache/backends/db.py     
2010-02-11 13:10:52 UTC (rev 12413)
@@ -65,7 +65,7 @@
                 cursor.execute("INSERT INTO %s (cache_key, value, expires) 
VALUES (%%s, %%s, %%s)" % self._table, [key, encoded, str(exp)])
         except DatabaseError:
             # To be threadsafe, updates/inserts are allowed to fail silently
-            transaction.rollback()
+            transaction.rollback_unless_managed()
             return False
         else:
             transaction.commit_unless_managed()

-- 
You received this message because you are subscribed to the Google Groups 
"Django updates" group.
To post to this group, send email to django-upda...@googlegroups.com.
To unsubscribe from this group, send email to 
django-updates+unsubscr...@googlegroups.com.
For more options, visit this group at 
http://groups.google.com/group/django-updates?hl=en.

Reply via email to