Changes the check for valid capabilities on discovering info, on not valid one we can end up with infinite loop querying server for discovery info.

cusax-fix
Damian Minkov 13 years ago
parent c8b1aff23f
commit 0eb87e36f0

@ -471,7 +471,7 @@ public DiscoverInfo discoverInfo(String entityID)
EntityCapsManager.Caps caps = capsManager.getCapsByUser(entityID);
// if caps is not valid, has empty hash
if (CACHE_NON_CAPS && (caps == null || caps.hash.equals("")))
if (CACHE_NON_CAPS && (caps == null || !caps.isValid(discoverInfo)))
{
discoverInfo = nonCapsCache.get(entityID);
if (discoverInfo != null)
@ -523,7 +523,7 @@ public DiscoverInfo discoverInfoNonBlocking(String entityID)
EntityCapsManager.Caps caps = capsManager.getCapsByUser(entityID);
// if caps is not valid, has empty hash
if (CACHE_NON_CAPS && (caps == null || caps.hash.equals("")))
if (CACHE_NON_CAPS && (caps == null || !caps.isValid(discoverInfo)))
{
discoverInfo = nonCapsCache.get(entityID);
if (discoverInfo != null)

Loading…
Cancel
Save