Backported DoomedTransaction handling from trunk r92792 to 2.11 branch

lib/python/Zope2/App/startup.py

@@ -249,7 +249,15 @@ class ZPublisherExceptionHook:
                 REQUEST['AUTHENTICATED_USER'] = AccessControl.User.nobody
 
             try:
-                f(client, REQUEST, t, v, traceback, error_log_url=error_log_url)
+                result = f(client, REQUEST, t, v, 
+                           traceback, 
+                           error_log_url=error_log_url)
+                if result is not None:
+                    t, v, traceback = result
+                    response = REQUEST.RESPONSE
+                    response.setStatus(t)
+                    response.setBody(v)
+                    return response
             except TypeError:
                 # Pre 2.6 call signature
                 f(client, REQUEST, t, v, traceback)
@@ -267,7 +275,10 @@ class TransactionsManager:
         transaction.begin()
 
     def commit(self):
-        transaction.commit()
+        if hasattr(transaction, 'isDoomed') and transaction.isDoomed():
+            transaction.abort()
+        else:
+            transaction.commit()
 
     def abort(self):
         transaction.abort()

lib/python/Zope2/App/tests/testDoomedTransaction.py

+##############################################################################
+#
+# Copyright (c) 2007 Zope Corporation and Contributors.
+# All Rights Reserved.
+#
+# This software is subject to the provisions of the Zope Public License,
+# Version 2.1 (ZPL).  A copy of the ZPL should accompany this distribution.
+# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
+# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
+# FOR A PARTICULAR PURPOSE.
+#
+##############################################################################
+
+import sys
+import unittest
+import logging
+import transaction
+
+class DoomedTransactionInManagerTest(unittest.TestCase):
+
+    def testDoomedFails(self):
+        transaction.begin()
+        trans = transaction.get()
+        trans.doom()
+        from transaction.interfaces import DoomedTransaction
+        self.assertRaises(DoomedTransaction, trans.commit)
+
+    def testDoomedSilentInTM(self):
+        from Zope2.App.startup import TransactionsManager
+        tm = TransactionsManager()
+        transaction.begin()
+        trans = transaction.get()
+        trans.doom()
+        tm.commit()
+        
+def test_suite():
+    suite = unittest.TestSuite()
+    suite.addTest(unittest.makeSuite(DoomedTransactionInManagerTest))
+    return suite
+
+if __name__ == '__main__':
+    unittest.main(defaultTest='test_suite')