From: Yehuda Sadeh <yehuda@redhat.com>
Date: Thu, 13 Dec 2018 13:34:13 +0000 (-0800)
Subject: json formatter: reset pending string on dump_stream()
X-Git-Tag: v14.1.0~616^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F23298%2Fhead;p=ceph.git

json formatter: reset pending string on dump_stream()

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
---

diff --git a/src/common/Formatter.cc b/src/common/Formatter.cc
index 703322e8a0b7..8f199ef7a7b2 100644
--- a/src/common/Formatter.cc
+++ b/src/common/Formatter.cc
@@ -303,6 +303,7 @@ void JSONFormatter::dump_string(const char *name, std::string_view s)
 
 std::ostream& JSONFormatter::dump_stream(const char *name)
 {
+  finish_pending_string();
   m_pending_name = name;
   m_is_pending_string = true;
   return m_pending_string;