From 9646258fdfd317d870872f2af24c86fb34a71686 Mon Sep 17 00:00:00 2001
From: Justin Clarke Casey
Date: Sun, 4 May 2008 00:53:01 +0000
Subject: * Refactor: Simplify CachedUserInfo.FolderReceive() by removing root
folder special case
---
.../Communications/Cache/CachedUserInfo.cs | 62 ++++++++++------------
1 file changed, 29 insertions(+), 33 deletions(-)
(limited to 'OpenSim')
diff --git a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
index 5b84958..18bd994 100644
--- a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
+++ b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
@@ -117,7 +117,7 @@ namespace OpenSim.Framework.Communications.Cache
}
///
- /// Store a folder pending categorization when its parent is received.
+ /// Store a folder pending arrival of its parent
///
///
private void AddPendingFolder(InventoryFolderImpl folder)
@@ -138,26 +138,26 @@ namespace OpenSim.Framework.Communications.Cache
}
///
- /// Add any pending folders which are children of parent
+ /// Add any pending folders which were received before the given folder
///
///
/// A
///
- private void ResolvePendingFolders(InventoryFolderImpl parent)
+ private void ResolvePendingFolders(InventoryFolderImpl newFolder)
{
- if (pendingCategorizationFolders.ContainsKey(parent.ID))
+ if (pendingCategorizationFolders.ContainsKey(newFolder.ID))
{
- foreach (InventoryFolderImpl folder in pendingCategorizationFolders[parent.ID])
+ foreach (InventoryFolderImpl folder in pendingCategorizationFolders[newFolder.ID])
{
// m_log.DebugFormat(
// "[INVENTORY CACHE]: Resolving pending received folder {0} {1} into {2} {3}",
// folder.name, folder.folderID, parent.name, parent.folderID);
- lock (parent.SubFolders)
+ lock (newFolder.SubFolders)
{
- if (!parent.SubFolders.ContainsKey(folder.ID))
+ if (!newFolder.SubFolders.ContainsKey(folder.ID))
{
- parent.SubFolders.Add(folder.ID, folder);
+ newFolder.SubFolders.Add(folder.ID, folder);
}
}
}
@@ -209,7 +209,7 @@ namespace OpenSim.Framework.Communications.Cache
///
///
///
- private void FolderReceive(InventoryFolderImpl folderInfo)
+ private void FolderReceive(InventoryFolderImpl newFolder)
{
// m_log.DebugFormat(
// "[INVENTORY CACHE]: Received folder {0} {1} for user {2}",
@@ -217,46 +217,42 @@ namespace OpenSim.Framework.Communications.Cache
if (RootFolder == null)
{
- if (folderInfo.ParentID == LLUUID.Zero)
+ if (newFolder.ParentID == LLUUID.Zero)
{
- m_rootFolder = folderInfo;
+ m_rootFolder = newFolder;
}
- }
- else if (RootFolder.ID == folderInfo.ParentID)
- {
- lock (RootFolder.SubFolders)
+ else
{
- if (!RootFolder.SubFolders.ContainsKey(folderInfo.ID))
- {
- RootFolder.SubFolders.Add(folderInfo.ID, folderInfo);
- }
- else
- {
- AddPendingFolder(folderInfo);
- }
+ AddPendingFolder(newFolder);
}
}
else
{
- InventoryFolderImpl folder = RootFolder.FindFolder(folderInfo.ParentID);
+ InventoryFolderImpl parentFolder = RootFolder.FindFolder(newFolder.ParentID);
- lock (folder.SubFolders)
+ if (parentFolder != null)
{
- if (folder != null)
+ lock (parentFolder.SubFolders)
{
- if (!folder.SubFolders.ContainsKey(folderInfo.ID))
+ if (!parentFolder.SubFolders.ContainsKey(newFolder.ID))
{
- folder.SubFolders.Add(folderInfo.ID, folderInfo);
+ parentFolder.SubFolders.Add(newFolder.ID, newFolder);
+ }
+ else
+ {
+ m_log.WarnFormat(
+ "[INVENTORY CACHE]: Received folder {0} {1} from inventory service which has already been received",
+ newFolder.Name, newFolder.ID);
}
- }
- else
- {
- AddPendingFolder(folderInfo);
}
}
+ else
+ {
+ AddPendingFolder(newFolder);
+ }
}
- ResolvePendingFolders(folderInfo);
+ ResolvePendingFolders(newFolder);
}
///
--
cgit v1.1