From c18e76cb10e7d0d5c4e6351d8f141b553bb1e70c Mon Sep 17 00:00:00 2001
From: Gleb Natapov <gleb@cloudius-systems.com>
Date: Wed, 6 May 2015 18:17:25 +0300
Subject: [PATCH] rpc: fix out stream flushing

Flush it only once per rpc call instead of once per argument.
---
 rpc/rpc_impl.hh | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/rpc/rpc_impl.hh b/rpc/rpc_impl.hh
index e373f066b5..c44781db31 100644
--- a/rpc/rpc_impl.hh
+++ b/rpc/rpc_impl.hh
@@ -29,8 +29,8 @@
 namespace rpc {
 
 template<std::size_t N, typename Serializer, typename... T>
-inline std::enable_if_t<N == sizeof...(T), future<>> marshall(Serializer&, output_stream<char>&, std::tuple<T...>&&) {
-    return make_ready_future<>();
+inline std::enable_if_t<N == sizeof...(T), future<>> marshall(Serializer&, output_stream<char>& out, std::tuple<T...>&&) {
+    return out.flush();
 }
 
 template<std::size_t N = 0, typename Serializer, typename... T>
@@ -38,8 +38,6 @@ inline std::enable_if_t<N != sizeof...(T), future<>> marshall(Serializer& serial
     using tuple_type = std::tuple<T...>;
     return serialize(out, std::forward<typename std::tuple_element<N, tuple_type>::type>(std::get<N>(args))).then([&serialize, &out, args = std::move(args)] () mutable {
         return marshall<N + 1>(serialize, out, std::move(args));
-    }).then([&out] {
-        return out.flush();
     });
 }