diff options
Diffstat (limited to 'OpenSim/Addons/Groups/RemoteConnectorCacheWrapper.cs')
-rw-r--r-- | OpenSim/Addons/Groups/RemoteConnectorCacheWrapper.cs | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/OpenSim/Addons/Groups/RemoteConnectorCacheWrapper.cs b/OpenSim/Addons/Groups/RemoteConnectorCacheWrapper.cs index e7d38c2..3ac74fc 100644 --- a/OpenSim/Addons/Groups/RemoteConnectorCacheWrapper.cs +++ b/OpenSim/Addons/Groups/RemoteConnectorCacheWrapper.cs | |||
@@ -53,7 +53,7 @@ namespace OpenSim.Groups | |||
53 | private ForeignImporter m_ForeignImporter; | 53 | private ForeignImporter m_ForeignImporter; |
54 | 54 | ||
55 | private Dictionary<string, bool> m_ActiveRequests = new Dictionary<string, bool>(); | 55 | private Dictionary<string, bool> m_ActiveRequests = new Dictionary<string, bool>(); |
56 | private const int GROUPS_CACHE_TIMEOUT = 5 * 60; // 5 minutes | 56 | private const int GROUPS_CACHE_TIMEOUT = 1 * 60; // 1 minutes |
57 | 57 | ||
58 | // This all important cache cahces objects of different types: | 58 | // This all important cache cahces objects of different types: |
59 | // group-<GroupID> or group-<Name> => ExtendedGroupRecord | 59 | // group-<GroupID> or group-<Name> => ExtendedGroupRecord |
@@ -209,13 +209,10 @@ namespace OpenSim.Groups | |||
209 | public void SetAgentActiveGroup(string AgentID, GroupMembershipDelegate d) | 209 | public void SetAgentActiveGroup(string AgentID, GroupMembershipDelegate d) |
210 | { | 210 | { |
211 | GroupMembershipData activeGroup = d(); | 211 | GroupMembershipData activeGroup = d(); |
212 | if (activeGroup != null) | 212 | string cacheKey = "active-" + AgentID.ToString(); |
213 | { | 213 | lock (m_Cache) |
214 | string cacheKey = "active-" + AgentID.ToString(); | 214 | if (m_Cache.Contains(cacheKey)) |
215 | lock (m_Cache) | 215 | m_Cache.AddOrUpdate(cacheKey, activeGroup, GROUPS_CACHE_TIMEOUT); |
216 | if (m_Cache.Contains(cacheKey)) | ||
217 | m_Cache.AddOrUpdate(cacheKey, activeGroup, GROUPS_CACHE_TIMEOUT); | ||
218 | } | ||
219 | } | 216 | } |
220 | 217 | ||
221 | public ExtendedGroupMembershipData GetAgentActiveMembership(string AgentID, GroupMembershipDelegate d) | 218 | public ExtendedGroupMembershipData GetAgentActiveMembership(string AgentID, GroupMembershipDelegate d) |