diff options
author | mluto <m@luto.at> | 2013-03-29 10:09:39 +0100 |
---|---|---|
committer | mluto <m@luto.at> | 2013-03-29 10:09:39 +0100 |
commit | 6af160ee560d43f574ab017df7df4baca3fd8ded (patch) | |
tree | f94e95d86580c9ed1a1474e765098dc7d1a5ef1d /src/node/db/SessionManager.js | |
parent | f1b60e9867f62da9abdb97e150158da8eea4154b (diff) | |
download | etherpad-lite-6af160ee560d43f574ab017df7df4baca3fd8ded.zip |
Fix #1519: don't error in listSessionsOfGroup when there are non-existing sessions (by eldiddio)
Diffstat (limited to 'src/node/db/SessionManager.js')
-rw-r--r-- | src/node/db/SessionManager.js | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/node/db/SessionManager.js b/src/node/db/SessionManager.js index 60e0a7ac..571ea07b 100644 --- a/src/node/db/SessionManager.js +++ b/src/node/db/SessionManager.js @@ -347,7 +347,15 @@ function listSessionsWithDBKey (dbkey, callback) { exports.getSessionInfo(sessionID, function(err, sessionInfo) { - if(ERR(err, callback)) return; + if (err == "apierror: sessionID does not exist") + { + console.warn("Found bad session " + sessionID + " in " + dbkey + "."); + } + else if(ERR(err, callback)) + { + return; + } + sessions[sessionID] = sessionInfo; callback(); }); |