forward-port r105078 to trunk

6a6fe9ad · Andreas Zeidler · fda33974 · 6a6fe9ad
Commit 6a6fe9ad authored Oct 15, 2009 by Andreas Zeidler
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

src/ZPublisher/BaseRequest.py src/ZPublisher/BaseRequest.py +3 -1

No files found.
--- a/src/ZPublisher/BaseRequest.py
+++ b/src/ZPublisher/BaseRequest.py
@@ -211,8 +211,10 @@ class BaseRequest:
        self._held=None

    def close(self):
-        self.clear()
        notify(EndRequestEvent(None, self))
+        # subscribers might need the zodb, so `clear` must come afterwards
+        # (since `self._held=None` might close the connection, see above)
+        self.clear()

    def processInputs(self):
        """Do any input processing that could raise errors