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

* refactor: move iar name hashing into a method

0.6.5-rc1
Justin Clarke Casey 2009-04-30 19:57:07 +00:00
parent c7fd036b35
commit e7078520db
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
OpenSim/Framework/Communications/OspResolver.cs
View File

@ -104,6 +104,16 @@ namespace OpenSim.Framework.Communications
return null; return null;
} }
/// <summary>
/// Hash a profile name into a UUID
/// </summary>
/// <param name="name"></param>
/// <returns></returns>
public static UUID HashName(string name)
{
return new UUID(Utils.MD5(Encoding.Unicode.GetBytes(name)), 0);
}
/// <summary> /// <summary>
/// Resolve an OSPI name by querying existing persistent user profiles. If there is no persistent user profile /// Resolve an OSPI name by querying existing persistent user profiles. If there is no persistent user profile
/// then a temporary user profile is inserted in the cache. /// then a temporary user profile is inserted in the cache.
@ -133,7 +143,7 @@ namespace OpenSim.Framework.Communications
UserProfileData tempUserProfile = new UserProfileData(); UserProfileData tempUserProfile = new UserProfileData();
tempUserProfile.FirstName = firstName; tempUserProfile.FirstName = firstName;
tempUserProfile.SurName = lastName; tempUserProfile.SurName = lastName;
tempUserProfile.ID = new UUID(Utils.MD5(Encoding.Unicode.GetBytes(tempUserProfile.Name)), 0); tempUserProfile.ID = HashName(tempUserProfile.Name);
m_log.DebugFormat( m_log.DebugFormat(
"[OSP RESOLVER]: Adding temporary user profile for {0} {1}", tempUserProfile.Name, tempUserProfile.ID); "[OSP RESOLVER]: Adding temporary user profile for {0} {1}", tempUserProfile.Name, tempUserProfile.ID);

2
OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
View File

@ -311,7 +311,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
// Check that a suitable temporary user profile has been created. // Check that a suitable temporary user profile has been created.
UserProfileData user2Profile UserProfileData user2Profile
= scene.CommsManager.UserService.GetUserProfile( = scene.CommsManager.UserService.GetUserProfile(
new UUID(Utils.MD5(Encoding.Unicode.GetBytes(user2FirstName + " " + user2LastName)), 0)); OspResolver.HashName(user2FirstName + " " + user2LastName));
Assert.That(user2Profile, Is.Not.Null); Assert.That(user2Profile, Is.Not.Null);
Assert.That(user2Profile.FirstName == user2FirstName); Assert.That(user2Profile.FirstName == user2FirstName);
Assert.That(user2Profile.SurName == user2LastName); Assert.That(user2Profile.SurName == user2LastName);