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

minor cleanup

melanie
UbitUmarov 2016-11-09 19:41:07 +00:00
parent c349a1a5e7
commit 924c5fb55e
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -144,10 +144,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.UserAccounts
return account; return account;
account = base.GetUserAccount(scopeID, userID); account = base.GetUserAccount(scopeID, userID);
lock(m_Cache)
if(account != null) if(account != null)
{
lock(m_Cache)
m_Cache.Cache(userID, account); m_Cache.Cache(userID, account);
}
return account; return account;
} }
@ -162,9 +163,10 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.UserAccounts
account = base.GetUserAccount(scopeID, firstName, lastName); account = base.GetUserAccount(scopeID, firstName, lastName);
if (account != null) if (account != null)
{
lock(m_Cache) lock(m_Cache)
m_Cache.Cache(account.PrincipalID, account); m_Cache.Cache(account.PrincipalID, account);
}
return account; return account;
} }
@ -195,16 +197,17 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.UserAccounts
List<UserAccount> ext = base.GetUserAccounts(scopeID, missing); List<UserAccount> ext = base.GetUserAccounts(scopeID, missing);
if(ext != null && ext.Count >0 ) if(ext != null && ext.Count >0 )
{ {
accs.AddRange(ext);
foreach(UserAccount acc in ext) foreach(UserAccount acc in ext)
{ {
if(acc != null) if(acc != null)
{
accs.Add(acc);
lock(m_Cache) lock(m_Cache)
m_Cache.Cache(acc.PrincipalID, acc); m_Cache.Cache(acc.PrincipalID, acc);
} }
} }
} }
}
return accs; return accs;
} }