[Zope-Checkins] SVN: Zope/trunk/ Merged r77042 from the 2.10 branch.

[Hanno Schlichting]

Log message for revision 77043:
  Merged r77042 from the 2.10 branch.
  

Changed:
  U   Zope/trunk/doc/CHANGES.txt
  U   Zope/trunk/lib/python/ZPublisher/BaseRequest.py

-=-
Modified: Zope/trunk/doc/CHANGES.txt
===================================================================
--- Zope/trunk/doc/CHANGES.txt	2007-06-25 14:10:23 UTC (rev 77042)
+++ Zope/trunk/doc/CHANGES.txt	2007-06-25 14:22:46 UTC (rev 77043)
@@ -97,6 +97,10 @@
 
     Bugs Fixed
 
+      - Fixed bug in ZPublisher.BaseRequest with persistent site managers.
+        An EndRequestEvent was thrown after the ZODB connection was already
+        closed and thus the site manager not being available anymore.
+
       - Collector #2295: Comments in PythonScripts could lead to syntax
         errors
 

Modified: Zope/trunk/lib/python/ZPublisher/BaseRequest.py
===================================================================
--- Zope/trunk/lib/python/ZPublisher/BaseRequest.py	2007-06-25 14:10:23 UTC (rev 77042)
+++ Zope/trunk/lib/python/ZPublisher/BaseRequest.py	2007-06-25 14:22:46 UTC (rev 77043)
@@ -202,8 +202,8 @@
 
     def close(self):
         self.other.clear()
+        notify(EndRequestEvent(None, self))
         self._held=None
-        notify(EndRequestEvent(None, self))
 
     def processInputs(self):
         """Do any input processing that could raise errors