X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=util%2Fserialization.lua;h=7071d3f75e03f4af116919ff53f29fbf9b1578f6;hb=9d3b72ab4f32fb981a96f7361ce77838e86e8492;hp=41d963e905d47a956c70d5f3ed9ee164edcba692;hpb=8c49fa345423ba5b7a98bf7f68e29225fb19ed71;p=prosody.git

diff --git a/util/serialization.lua b/util/serialization.lua
index 41d963e9..7071d3f7 100644
--- a/util/serialization.lua
+++ b/util/serialization.lua
@@ -1,4 +1,4 @@
--- Prosody IM v0.4
+-- Prosody IM
 -- Copyright (C) 2008-2009 Matthew Wild
 -- Copyright (C) 2008-2009 Waqas Hussain
 -- 
@@ -13,6 +13,7 @@ local t_insert = table.insert;
 local t_concat = table.concat;
 local error = error;
 local pairs = pairs;
+local next = next;
 
 local debug_traceback = debug.traceback;
 local log = require "util.logger".init("serialization");
@@ -34,25 +35,30 @@ local function _simplesave(o, ind, t, func)
 	elseif type(o) == "string" then
 		func(t, (("%q"):format(o):gsub("\\\n", "\\n")));
 	elseif type(o) == "table" then
-		func(t, "{\n");
-		for k,v in pairs(o) do
-			func(t, indent(ind));
-			func(t, "[");
-			func(t, basicSerialize(k));
-			func(t, "] = ");
-			if ind == 0 then
-				_simplesave(v, 0, t, func);
-			else
-				_simplesave(v, ind+1, t, func);
+		if next(o) ~= nil then
+			func(t, "{\n");
+			for k,v in pairs(o) do
+				func(t, indent(ind));
+				func(t, "[");
+				func(t, basicSerialize(k));
+				func(t, "] = ");
+				if ind == 0 then
+					_simplesave(v, 0, t, func);
+				else
+					_simplesave(v, ind+1, t, func);
+				end
+				func(t, ";\n");
 			end
-			func(t, ",\n");
+			func(t, indent(ind-1));
+			func(t, "}");
+		else
+			func(t, "{}");
 		end
-		func(t, indent(ind-1));
-		func(t, "}");
 	elseif type(o) == "boolean" then
 		func(t, (o and "true" or "false"));
 	else
-		log("warn", "cannot serialize a %s: %s", type(o), debug_traceback())
+		log("error", "cannot serialize a %s: %s", type(o), debug_traceback())
+		func(t, "nil");
 	end
 end