diff options
| author | Matthew Wild <mwild1@gmail.com> | 2012-01-22 22:55:49 +0000 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2012-01-22 22:55:49 +0000 |
| commit | 4d7ce5ef98953b67c80cc7f2fc347f01ad9cdd4e (patch) | |
| tree | acc1b9c5576f0ba21b56fd5b133a4a173798d042 /tools/migration | |
| parent | b803655fc3922d51ccfb44eebe8540e3ba562b2b (diff) | |
| parent | 075f0cbd7c732c108e03ec8596e9934db7b8b06a (diff) | |
| download | prosody-4d7ce5ef98953b67c80cc7f2fc347f01ad9cdd4e.tar.gz prosody-4d7ce5ef98953b67c80cc7f2fc347f01ad9cdd4e.zip | |
Merge with trunk
Diffstat (limited to 'tools/migration')
| -rw-r--r-- | tools/migration/migrator/jabberd14.lua | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/tools/migration/migrator/jabberd14.lua b/tools/migration/migrator/jabberd14.lua index 47004a52..54c45d94 100644 --- a/tools/migration/migrator/jabberd14.lua +++ b/tools/migration/migrator/jabberd14.lua @@ -67,15 +67,12 @@ local parse_xml = (function() 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) |