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

* Comment out user profile cache update method for now

0.6.5-rc1
Justin Clarke Casey 2009-04-21 20:12:33 +00:00
parent 27c8cc5b1f
commit 607156cae8
4 changed files with 30 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
View File

@ -65,7 +65,7 @@ namespace OpenSim.Framework.Communications.Cache
private readonly CommunicationsManager m_commsManager; private readonly CommunicationsManager m_commsManager;
public UserProfileData UserProfile { get { return m_userProfile; } } public UserProfileData UserProfile { get { return m_userProfile; } }
protected internal UserProfileData m_userProfile; private UserProfileData m_userProfile;
/// <summary> /// <summary>
/// Have we received the user's inventory from the inventory service? /// Have we received the user's inventory from the inventory service?

37
OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs
View File

@ -173,23 +173,26 @@ namespace OpenSim.Framework.Communications.Cache
/// </summary> /// </summary>
/// <param name="userProfile"></param> /// <param name="userProfile"></param>
/// <returns>true if a user profile was found to update, false otherwise</returns> /// <returns>true if a user profile was found to update, false otherwise</returns>
public bool UpdateProfile(UserProfileData userProfile) // Commented out for now. The implementation needs to be improved by protecting against race conditions,
{ // probably by making sure that the update doesn't use the UserCacheInfo.UserProfile directly (possibly via
lock (m_userProfilesById) // returning a read only class from the cache).
{ // public bool UpdateProfile(UserProfileData userProfile)
CachedUserInfo userInfo = GetUserDetails(userProfile.ID); // {
// lock (m_userProfilesById)
if (userInfo != null) // {
{ // CachedUserInfo userInfo = GetUserDetails(userProfile.ID);
userInfo.m_userProfile = userProfile; //
m_commsManager.UserService.UpdateUserProfile(userProfile); // if (userInfo != null)
// {
return true; // userInfo.m_userProfile = userProfile;
} // m_commsManager.UserService.UpdateUserProfile(userProfile);
} //
// return true;
return false; // }
} // }
//
// return false;
// }
/// <summary> /// <summary>
/// Populate caches with the given user profile /// Populate caches with the given user profile

3
OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs
View File

@ -71,6 +71,8 @@ namespace OpenSim.Framework.Communications.Tests
Assert.That(existingUserInfo, Is.Not.Null, "User info not found by name"); Assert.That(existingUserInfo, Is.Not.Null, "User info not found by name");
} }
/**
* Disabled as not fully implemented
[Test] [Test]
public void TestUpdateProfile() public void TestUpdateProfile()
{ {
@ -101,6 +103,7 @@ namespace OpenSim.Framework.Communications.Tests
Assert.That(retrievedProfile.SurName, Is.EqualTo(newLastName)); Assert.That(retrievedProfile.SurName, Is.EqualTo(newLastName));
Assert.That(userDataPlugin.GetUserByUUID(userId).SurName, Is.EqualTo(newLastName)); Assert.That(userDataPlugin.GetUserByUUID(userId).SurName, Is.EqualTo(newLastName));
} }
*/
[Test] [Test]
public void TestFetchInventory() public void TestFetchInventory()

7
OpenSim/Framework/UserProfileData.cs
View File

@ -156,7 +156,12 @@ namespace OpenSim.Framework
/// </summary> /// </summary>
public virtual ulong HomeRegion public virtual ulong HomeRegion
{ {
get { return Utils.UIntsToLong((m_homeRegionX * (uint)Constants.RegionSize), (m_homeRegionY * (uint)Constants.RegionSize)); } get
{
return Utils.UIntsToLong(
m_homeRegionX * (uint)Constants.RegionSize, m_homeRegionY * (uint)Constants.RegionSize);
}
set set
{ {
m_homeRegionX = (uint) (value >> 40); m_homeRegionX = (uint) (value >> 40);