# HG changeset patch # User Waqas Hussain # Date 1274642985 -18000 # Node ID 7426727548ed7a26d8831cb62f6bcd41da1a4b9d # Parent 34280b1544fc674678b2fe352423659ba815a7f9 rostermanager: Mark rosters which fail to load as broken, and never save them. diff -r 34280b1544fc -r 7426727548ed core/rostermanager.lua --- a/core/rostermanager.lua Mon May 24 00:04:22 2010 +0500 +++ b/core/rostermanager.lua Mon May 24 00:29:45 2010 +0500 @@ -96,7 +96,7 @@ local data, err = datamanager.load(username, host, "roster"); roster = data or {}; if user then user.roster = roster; end - if not roster[false] then roster[false] = { }; end + if not roster[false] then roster[false] = { broken = err or nil }; end if roster[jid] then roster[jid] = nil; log("warn", "roster for "..jid.." has a self-contact"); @@ -125,6 +125,7 @@ if metadata.version ~= true then metadata.version = (metadata.version or 0) + 1; end + if roster[false].broken then return nil, "Not saving broken roster" end return datamanager.store(username, host, "roster", roster); end log("warn", "save_roster: user had no roster to save");