From 939b6ba80bedcbe2092de424a67124bca34d0cae Mon Sep 17 00:00:00 2001 From: Goffi Date: Thu, 26 Nov 2015 17:00:18 +0100 Subject: [PATCH] core (memory): catch exceptions.UnknownEntityError in getMainResource --- src/memory/memory.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/memory/memory.py b/src/memory/memory.py index 96789ef0..8e10f28b 100644 --- a/src/memory/memory.py +++ b/src/memory/memory.py @@ -565,6 +565,7 @@ class Memory(object): return (list[unicode]): list of resources @raise exceptions.UnknownEntityError: if entity is not in cache + @raise ValueError: entity_jid has a resource """ if entity_jid.resource: raise ValueError("getAllResources must be used with a bare jid (got {})".format(entity_jid)) @@ -618,7 +619,11 @@ class Memory(object): return None # MUC rooms have no main resource except KeyError: # plugin not found pass - resources = self.getAllResources(entity_jid, profile_key) + try: + resources = self.getAllResources(entity_jid, profile_key) + except exceptions.UnknownEntityError: + log.warning(u"Entity is not in cache, we can't find any resource") + return None priority_resources = [] for resource in resources: full_jid = copy.copy(entity_jid)