Merge 0.6->0.7

[prosody.git] / util / serialization.lua

diff --git a/util/serialization.lua b/util/serialization.lua
index 1ffd3e16497be7e845e8d89a072a65852b962749..bad2fe43dddf7cc0b7ec17da6892f10dffe4f646 100644 (file)
--- a/util/serialization.lua
+++ b/util/serialization.lua
@@ -1,6 +1,6 @@
--- Prosody IM v0.4
--- Copyright (C) 2008-2009 Matthew Wild
--- Copyright (C) 2008-2009 Waqas Hussain
+-- Prosody IM
+-- Copyright (C) 2008-2010 Matthew Wild
+-- Copyright (C) 2008-2010 Waqas Hussain
 -- 
 -- This project is MIT/X11 licensed. Please see the
 -- COPYING file in the source package for more information.
@@ -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,21 +35,25 @@ 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