prosody
e89320b8a789
core/sessionmanager.lua

Find changesets by keywords by author, files, the commit message, revision number or hash, or revset expression.

Software / code / prosody

Comparison

core/sessionmanager.lua @ 8185:e89320b8a789

Merge 0.10 -> trunk
author Matthew Wild <mwild1@gmail.com>
date Fri, 28 Jul 2017 23:47:38 +0100
parent 7950:f91e7ec9654e
parent 8184:dbcae15b4282
child 8555:4f0f5b49bb03
comparison
equal deleted inserted replaced
8181:79f73af4c410 8185:e89320b8a789
186 end 186 end
187 187
188 local err; 188 local err;
189 session.roster, err = rm_load_roster(session.username, session.host); 189 session.roster, err = rm_load_roster(session.username, session.host);
190 if err then 190 if err then
191 -- FIXME: Why is all this rollback down here, instead of just doing the roster test up above?
191 full_sessions[session.full_jid] = nil; 192 full_sessions[session.full_jid] = nil;
192 hosts[session.host].sessions[session.username].sessions[resource] = nil; 193 hosts[session.host].sessions[session.username].sessions[resource] = nil;
193 session.full_jid = nil; 194 session.full_jid = nil;
194 session.resource = nil; 195 session.resource = nil;
196 if session.type == "c2s" then
197 session.type = "c2s_unbound";
198 end
195 if next(bare_sessions[session.username..'@'..session.host].sessions) == nil then 199 if next(bare_sessions[session.username..'@'..session.host].sessions) == nil then
196 bare_sessions[session.username..'@'..session.host] = nil; 200 bare_sessions[session.username..'@'..session.host] = nil;
197 hosts[session.host].sessions[session.username] = nil; 201 hosts[session.host].sessions[session.username] = nil;
198 end 202 end
199 session.log("error", "Roster loading failed: %s", err); 203 session.log("error", "Roster loading failed: %s", err);