Merge branch '2.3' into develop

2019-06-20 13:00:13 +03:00
parent 1fbb57f9b2 301b1b63ab
commit 20f595d978
5 changed files with 25 additions and 16 deletions
--- a/server/modules/routing/avrorouter/avro_client.cc
+++ b/server/modules/routing/avrorouter/avro_client.cc
@ -585,6 +585,8 @@ GWBUF* read_avro_json_schema(std::string avrofile, std::string dir)
        std::stringstream ss;
        ss << file.rdbuf();
        std::string text = ss.str();
+        mxs::rtrim(text);
+        text += '\n';
        mxs::Buffer buffer(std::vector<uint8_t>(text.begin(), text.end()));
        rval = buffer.release();
    }