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

* Add folders and items locking in external manipulations of InventoryFolderImpl carried out by CachedUserInfo 

* These will do temporarily pending refactoring
0.6.0-stable
Justin Clarke Casey 2008-04-22 20:59:08 +00:00
parent 8d8b4a314f
commit cd29f90418
1 changed files with 35 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -142,9 +142,12 @@ namespace OpenSim.Framework.Communications.Cache
// "[INVENTORY CACHE]: Resolving pending received folder {0} {1} into {2} {3}", // "[INVENTORY CACHE]: Resolving pending received folder {0} {1} into {2} {3}",
// folder.name, folder.folderID, parent.name, parent.folderID); // folder.name, folder.folderID, parent.name, parent.folderID);
if (!parent.SubFolders.ContainsKey(folder.ID)) lock (parent.SubFolders)
{ {
parent.SubFolders.Add(folder.ID, folder); if (!parent.SubFolders.ContainsKey(folder.ID))
{
parent.SubFolders.Add(folder.ID, folder);
}
} }
} }
} }
@ -212,28 +215,34 @@ namespace OpenSim.Framework.Communications.Cache
} }
else if (RootFolder.ID == folderInfo.ParentID) else if (RootFolder.ID == folderInfo.ParentID)
{ {
if (!RootFolder.SubFolders.ContainsKey(folderInfo.ID)) lock (RootFolder.SubFolders)
{ {
RootFolder.SubFolders.Add(folderInfo.ID, folderInfo); if (!RootFolder.SubFolders.ContainsKey(folderInfo.ID))
} {
else RootFolder.SubFolders.Add(folderInfo.ID, folderInfo);
{ }
AddPendingFolder(folderInfo); else
{
AddPendingFolder(folderInfo);
}
} }
} }
else else
{ {
InventoryFolderImpl folder = RootFolder.HasSubFolder(folderInfo.ParentID); InventoryFolderImpl folder = RootFolder.HasSubFolder(folderInfo.ParentID);
if (folder != null) lock (folder.SubFolders)
{ {
if (!folder.SubFolders.ContainsKey(folderInfo.ID)) if (folder != null)
{ {
folder.SubFolders.Add(folderInfo.ID, folderInfo); if (!folder.SubFolders.ContainsKey(folderInfo.ID))
{
folder.SubFolders.Add(folderInfo.ID, folderInfo);
}
}
else
{
AddPendingFolder(folderInfo);
} }
}
else
{
AddPendingFolder(folderInfo);
} }
} }
@ -259,9 +268,12 @@ namespace OpenSim.Framework.Communications.Cache
{ {
if (itemInfo.Folder == RootFolder.ID) if (itemInfo.Folder == RootFolder.ID)
{ {
if (!RootFolder.Items.ContainsKey(itemInfo.ID)) lock (RootFolder.Items)
{ {
RootFolder.Items.Add(itemInfo.ID, itemInfo); if (!RootFolder.Items.ContainsKey(itemInfo.ID))
{
RootFolder.Items.Add(itemInfo.ID, itemInfo);
}
} }
} }
else else
@ -269,9 +281,12 @@ namespace OpenSim.Framework.Communications.Cache
InventoryFolderImpl folder = RootFolder.HasSubFolder(itemInfo.Folder); InventoryFolderImpl folder = RootFolder.HasSubFolder(itemInfo.Folder);
if (folder != null) if (folder != null)
{ {
if (!folder.Items.ContainsKey(itemInfo.ID)) lock (folder.Items)
{ {
folder.Items.Add(itemInfo.ID, itemInfo); if (!folder.Items.ContainsKey(itemInfo.ID))
{
folder.Items.Add(itemInfo.ID, itemInfo);
}
} }
} }
} }