Only force end of previous message if there actually is one.

This avoids outputting empty messages on messaget::eom.

Author: peterschrammel

src/util/message.h

@@ -209,7 +209,8 @@ class messaget
 
     mstreamt &operator << (const xmlt &data)
     {
-      *this << eom; // force end of previous message
+      if(this->tellp() > 0)
+        *this << eom; // force end of previous message
       if(message.message_handler)
       {
         message.message_handler->print(message_level, data);
@@ -219,7 +220,8 @@ class messaget
 
     mstreamt &operator << (const json_objectt &data)
     {
-      *this << eom; // force end of previous message
+      if(this->tellp() > 0)
+        *this << eom; // force end of previous message
       if(message.message_handler)
       {
         message.message_handler->print(message_level, data);
@@ -243,7 +245,8 @@ class messaget
     /// Returns a reference to the top-level JSON array stream
     json_stream_arrayt &json_stream()
     {
-      *this << eom; // force end of previous message
+      if(this->tellp() > 0)
+        *this << eom; // force end of previous message
       return message.message_handler->get_json_stream();
     }
 
@@ -264,9 +267,10 @@ class messaget
   {
     if(m.message.message_handler)
     {
+      std::string msg = m.str();
       m.message.message_handler->print(
         m.message_level,
-        m.str(),
+        msg,
         -1,
         m.source_location);
       m.message.message_handler->flush(m.message_level);