Ensure that interaction ends, once begun.

Wrap in try-finally. Cherry-pick c73dfcd1 from master.

Ensure that interaction ends, once begun.
Wrap in try-finally. Cherry-pick c73dfcd1 from master.
d307bb9c · Malthe Borch · Tres Seaver · a2e8e90a · d307bb9c
Commit d307bb9c authored Oct 19, 2012 by Malthe Borch Committed by Tres Seaver Jun 18, 2015
Show whitespace changes
Inline Side-by-side

Showing with 42 additions and 41 deletions

src/ZPublisher/WSGIPublisher.py src/ZPublisher/WSGIPublisher.py +42 -41

No files found.
--- a/src/ZPublisher/WSGIPublisher.py
+++ b/src/ZPublisher/WSGIPublisher.py
@@ -167,6 +167,7 @@ def publish(request, module_name,

    notify(PubStart(request))
    newInteraction()
+    try:
        request.processInputs()
        response = request.response

@@ -206,7 +207,7 @@ def publish(request, module_name,

        if result is not response:
            response.setBody(result)
-
+    finally:
        endInteraction()

    notify(PubBeforeCommit(request))