[Zope-Checkins] SVN: Zope/trunk/src/ZPublisher/Publish.py - forward ported r105590 from 2.12 branch

[Yvo Schubbe]

Log message for revision 111261:
  - forward ported r105590 from 2.12 branch

Changed:
  U   Zope/trunk/src/ZPublisher/Publish.py

-=-
Modified: Zope/trunk/src/ZPublisher/Publish.py
===================================================================
--- Zope/trunk/src/ZPublisher/Publish.py	2010-04-22 11:35:45 UTC (rev 111260)
+++ Zope/trunk/src/ZPublisher/Publish.py	2010-04-22 11:37:30 UTC (rev 111261)
@@ -173,14 +173,13 @@
                                         )
                     retry = True
             finally:
-                
                 # Note: 'abort's can fail. Nevertheless, we want end request handling
-                try: 
-                    
-                    notify(PubBeforeAbort(request, exc_info, retry))
-                    
-                    if transactions_manager:
-                        transactions_manager.abort()
+                try:
+                    try:
+                        notify(PubBeforeAbort(request, exc_info, retry))
+                    finally:
+                        if transactions_manager:
+                            transactions_manager.abort()
                 finally:
                     endInteraction()
                     notify(PubFailure(request, exc_info, retry))
@@ -200,17 +199,16 @@
         else:
             # Note: 'abort's can fail. Nevertheless, we want end request handling
             try:
-                
-                notify(PubBeforeAbort(request, exc_info, False))
-                
-                if transactions_manager:
-                    transactions_manager.abort()
+                try:
+                    notify(PubBeforeAbort(request, exc_info, False))
+                finally:
+                    if transactions_manager:
+                        transactions_manager.abort()
             finally:
                 endInteraction()
                 notify(PubFailure(request, exc_info, False))
             raise
 
-
 def publish_module_standard(module_name,
                    stdin=sys.stdin, stdout=sys.stdout, stderr=sys.stderr,
                    environ=os.environ, debug=0, request=None, response=None):