OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

GetUserAccounts cannot cache null accounts

melanie
UbitUmarov 2016-11-10 23:14:08 +00:00
parent 58b7be48a9
commit 56a79a252c
3 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/LocalUserAccountServiceConnector.cs
View File

@ -211,9 +211,14 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.UserAccounts
List<UserAccount> ext = UserAccountService.GetUserAccounts(scopeID, missing); List<UserAccount> ext = UserAccountService.GetUserAccounts(scopeID, missing);
if(ext != null && ext.Count > 0) if(ext != null && ext.Count > 0)
{ {
ret.AddRange(ext);
foreach(UserAccount acc in ext) foreach(UserAccount acc in ext)
m_Cache.Cache(acc.PrincipalID, acc); {
if(acc != null)
{
ret.Add(acc);
m_Cache.Cache(acc.PrincipalID, acc);
}
}
} }
return ret; return ret;
} }

7
OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/RemoteUserAccountServiceConnector.cs
View File

@ -190,8 +190,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.UserAccounts
{ {
foreach(UserAccount acc in ext) foreach(UserAccount acc in ext)
{ {
accs.Add(acc); if(acc != null)
m_Cache.Cache(acc.PrincipalID, acc); {
accs.Add(acc);
m_Cache.Cache(acc.PrincipalID, acc);
}
} }
} }
} }

2
OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/UserAccountCache.cs
View File

@ -37,7 +37,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.UserAccounts
public class UserAccountCache : IUserAccountCacheModule public class UserAccountCache : IUserAccountCacheModule
{ {
private const double CACHE_EXPIRATION_SECONDS = 120000.0; // 33 hours! private const double CACHE_EXPIRATION_SECONDS = 120000.0; // 33 hours!
private const double CACHENULL_EXPIRATION_SECONDS = 600; // 5minutes private const double CACHENULL_EXPIRATION_SECONDS = 600; // 10minutes
// private static readonly ILog m_log = // private static readonly ILog m_log =
// LogManager.GetLogger( // LogManager.GetLogger(