Rev 4894: It helps if we actually pass the arguments to the helper function. in http://bazaar.launchpad.net/~jameinel/bzr/2.1-client-reconnect-819604

John Arbash Meinel john at arbash-meinel.com
Mon Oct 3 11:49:36 UTC 2011


At http://bazaar.launchpad.net/~jameinel/bzr/2.1-client-reconnect-819604

------------------------------------------------------------
revno: 4894
revision-id: john at arbash-meinel.com-20111003114917-hqvavok31oei3gbi
parent: john at arbash-meinel.com-20111003114428-uo8fz6damw4tle45
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 2.1-client-reconnect-819604
timestamp: Mon 2011-10-03 13:49:17 +0200
message:
  It helps if we actually pass the arguments to the helper function.
-------------- next part --------------
=== modified file 'bzrlib/smart/client.py'
--- a/bzrlib/smart/client.py	2011-10-03 11:44:28 +0000
+++ b/bzrlib/smart/client.py	2011-10-03 11:49:17 +0000
@@ -68,7 +68,8 @@
                       readv_body=None, body_stream=None):
         try:
             response_handler = self._send_request_no_retry(protocol_version,
-                method, args, body=None, readv_body=None, body_stream=None)
+                method, args, body=body, readv_body=readv_body,
+                body_stream=body_stream)
         except errors.ConnectionReset, e:
             # If we fail during the _send_request_no_retry phase, then we can
             # be confident that the server did not get our request, because we
@@ -78,7 +79,8 @@
             trace.log_exception_quietly()
             trace.warning('ConnectionReset calling %s, retrying' % (method,))
             response_handler = self._send_request_no_retry(protocol_version,
-                method, args, body=None, readv_body=None, body_stream=None)
+                method, args, body=body, readv_body=readv_body,
+                body_stream=body_stream)
         return response_handler
 
     def _run_call_hooks(self, method, args, body, readv_body):



More information about the bazaar-commits mailing list