Software / code / prosody
Diff
tools/migration/migrator/jabberd14.lua @ 4797:e239668aa6d2
Merge 0.9->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Sun, 29 Apr 2012 02:10:55 +0100 |
| parent | 4445:0434eb77d18c |
| child | 5218:8350eaa3f3f3 |
line wrap: on
line diff
--- a/tools/migration/migrator/jabberd14.lua Sun Apr 29 02:09:12 2012 +0100 +++ b/tools/migration/migrator/jabberd14.lua Sun Apr 29 02:10:55 2012 +0100 @@ -67,15 +67,12 @@ end)(); local function load_xml(path) - if path then - local f, err = io_open(path); - if not f then return f, err; end - local data = f:read("*a"); - f:close(); - if data then - return parse_xml(data); - end - end + local f, err = io_open(path); + if not f then return f, err; end + local data = f:read("*a"); + f:close(); + if not data then return; end + return parse_xml(data); end local function load_spool_file(host, filename, path)
