[Checkins] SVN: zope.app.debug/trunk/src/zope/app/debug/debug.py fix of 599 error on conflict error in request

[Adam Groszer]

Log message for revision 83383:
  fix of 599 error on conflict error in request
  see: http://mail.zope.org/pipermail/zope-dev/2008-January/030844.html

Changed:
  U   zope.app.debug/trunk/src/zope/app/debug/debug.py

-=-
Modified: zope.app.debug/trunk/src/zope/app/debug/debug.py
===================================================================
--- zope.app.debug/trunk/src/zope/app/debug/debug.py	2008-02-01 15:19:32 UTC (rev 83382)
+++ zope.app.debug/trunk/src/zope/app/debug/debug.py	2008-02-01 15:20:41 UTC (rev 83383)
@@ -99,8 +99,11 @@
         t, c = time.time(), time.clock()
 
         request = self._request(path, stdin, *args, **kw)
+
+        # agroszer: 2008.feb.1.: if a retry occurs in the publisher,
+        # the response will be LOST, so we must accept the returned request
+        request = _publish(request)
         getStatus = getattr(request.response, 'getStatus', lambda: None)
-        _publish(request)
 
         headers = request.response.getHeaders()
         headers.sort()
@@ -114,8 +117,11 @@
     def run(self, *args, **kw):
         t, c = time.time(), time.clock()
         request = self._request(*args, **kw)
+        # agroszer: 2008.feb.1.: if a retry occurs in the publisher,
+        # the response will be LOST, so we must accept the returned request
+        request = _publish(request, handle_errors=False)
         getStatus = getattr(request.response, 'getStatus', lambda: None)
-        _publish(request, handle_errors=False)
+
         return time.time()-t, time.clock()-c, getStatus()
 
     def debug(self, *args, **kw):