From 315e9ffad8cdc871794a7aac9089eef1f7fea10e Mon Sep 17 00:00:00 2001
From: Jean Flach <jean-marcel.flach@icinga.com>
Date: Thu, 13 Sep 2018 15:40:27 +0200
Subject: [PATCH] Stringify flat values

---
 lib/redis/rediswriter-utility.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/lib/redis/rediswriter-utility.cpp b/lib/redis/rediswriter-utility.cpp
index 4251a30a5..626506f65 100644
--- a/lib/redis/rediswriter-utility.cpp
+++ b/lib/redis/rediswriter-utility.cpp
@@ -30,6 +30,7 @@
 #include "base/objectlock.hpp"
 #include "base/array.hpp"
 #include "base/scriptglobal.hpp"
+#include "base/convert.hpp"
 #include <map>
 #include <utility>
 #include <vector>
@@ -253,9 +254,13 @@ Dictionary::Ptr RedisWriter::SerializeVars(const CustomVarObject::Ptr& object)
 			auto it (scalarVars.find(kv.first));
 			if (it != scalarVars.end()) {
 				for (auto& scalarVar : it->second) {
+					String strVal = Convert::ToString(scalarVar.second);
+					if (scalarVar.second.GetType() == ValueEmpty)
+						strVal = "NULL";
+
 					flatVars->Set(SHA1(PackObject(scalarVar.first)), (Dictionary::Ptr)new Dictionary({
 						{"name", scalarVar.first},
-						{"value", scalarVar.second}
+						{"value", strVal}
 					}));
 				}
 			}