fix rollback behavior with transaction context manager and failed two phase transactions

diff --git a/lib/sqlalchemy/orm/session.py b/lib/sqlalchemy/orm/session.py
index f32ec25ec24a96df4185b9d23ba0c71754981d58..03471df34131f87ce72c9ac8b7ad0267d6ee322c 100644 (file)
--- a/lib/sqlalchemy/orm/session.py
+++ b/lib/sqlalchemy/orm/session.py
@@ -238,11 +238,7 @@ class SessionTransaction(object):
                 for t in util.Set(self._connections.values()):
                     t[1].prepare()
             except:
-                for t in util.Set(self._connections.values()):
-                    try:
-                        t[1].rollback()
-                    except:
-                        pass
+                self.rollback()
                 raise
         
         self._deactivate()
@@ -310,7 +306,11 @@ class SessionTransaction(object):
         if self.session.transaction is None:
             return
         if type is None:
-            self.commit()
+            try:
+                self.commit()
+            except:
+                self.rollback()
+                raise
         else:
             self.rollback()