diff options
author | Erik Johnston <erik@matrix.org> | 2015-11-11 17:51:14 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2015-11-11 17:51:14 +0000 |
commit | 6341be45c6ceaa1b01a0b98ac6e24d2684841a26 (patch) | |
tree | e3bd4addb574125ee81931c20feb57c0712d46b0 /synapse/handlers/presence.py | |
parent | Remove anonymous access, since its not ready yet (diff) | |
parent | Merge pull request #359 from matrix-org/markjh/incremental_indexing (diff) | |
download | synapse-6341be45c6ceaa1b01a0b98ac6e24d2684841a26.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.11.0
Diffstat (limited to 'synapse/handlers/presence.py')
-rw-r--r-- | synapse/handlers/presence.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/handlers/presence.py b/synapse/handlers/presence.py index 0b780cd528..aca65096fc 100644 --- a/synapse/handlers/presence.py +++ b/synapse/handlers/presence.py @@ -950,7 +950,8 @@ class PresenceHandler(BaseHandler): ) while len(self._remote_offline_serials) > MAX_OFFLINE_SERIALS: self._remote_offline_serials.pop() # remove the oldest - del self._user_cachemap[user] + if user in self._user_cachemap: + del self._user_cachemap[user] else: # Remove the user from remote_offline_serials now that they're # no longer offline |