Merge branch 'master' into careminster

Conflicts:
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
	OpenSim/Services/LLLoginService/LLLoginResponse.cs
	OpenSim/Services/LLLoginService/LLLoginService.cs

2 files changed, 74 insertions, 38 deletions

diff --git a/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs b/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
index 322addd..161f160 100644
--- a/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
@@ -60,8 +60,8 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
         // The pair of Dictionaries are used to handle the switching of classified ads
         // by maintaining a cache of classified id to creator id mappings and an interest
         // count. The entries are removed when the interest count reaches 0.
-        Dictionary<UUID,UUID> classifiedCache = new Dictionary<UUID, UUID>();
-        Dictionary<UUID,int> classifiedInterest = new Dictionary<UUID, int>();
+        Dictionary<UUID, UUID> m_classifiedCache = new Dictionary<UUID, UUID>();
+        Dictionary<UUID, int> m_classifiedInterest = new Dictionary<UUID, int>();
 
         public Scene Scene
         {
@@ -102,7 +102,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
 
         /// <summary>
         /// Gets or sets a value indicating whether this
-        /// <see cref="BlueWall.SlipStream.ProfileModule.UserProfileModule"/> is enabled.
+        /// <see cref="OpenSim.Region.Coremodules.UserProfiles.UserProfileModule"/> is enabled.
         /// </summary>
         /// <value>
         /// <c>true</c> if enabled; otherwise, <c>false</c>.
@@ -331,16 +331,16 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
 
                 classifieds[cid] = name;
 
-                if(!classifiedCache.ContainsKey(cid))
+                lock (m_classifiedCache)
                 {
-                    lock(classifiedCache)
-                        classifiedCache.Add(cid,creatorId);
-                    lock(classifiedInterest)
-                        classifiedInterest.Add(cid, 0);
-                }
+                    if (!m_classifiedCache.ContainsKey(cid))
+                    {
+                        m_classifiedCache.Add(cid,creatorId);
+                        m_classifiedInterest.Add(cid, 0);
+                    }
 
-                lock(classifiedInterest)
-                    classifiedInterest[cid] ++;
+                    m_classifiedInterest[cid]++;
+                }
             }
 
             remoteClient.SendAvatarClassifiedReply(new UUID(args[0]), classifieds);
@@ -352,19 +352,19 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
             UserClassifiedAdd ad = new UserClassifiedAdd();
             ad.ClassifiedId = queryClassifiedID;
 
-            if(classifiedCache.ContainsKey(queryClassifiedID))
-            {   
-                target = classifiedCache[queryClassifiedID];
+            lock (m_classifiedCache)
+            {
+                if (m_classifiedCache.ContainsKey(queryClassifiedID))
+                {   
+                    target = m_classifiedCache[queryClassifiedID];
 
-                lock(classifiedInterest)
-                    classifiedInterest[queryClassifiedID] --;
+                    m_classifiedInterest[queryClassifiedID] --;
 
-                if(classifiedInterest[queryClassifiedID] == 0)
-                {
-                    lock(classifiedInterest)
-                        classifiedInterest.Remove(queryClassifiedID);
-                    lock(classifiedCache)
-                        classifiedCache.Remove(queryClassifiedID);
+                    if (m_classifiedInterest[queryClassifiedID] == 0)
+                    {
+                        m_classifiedInterest.Remove(queryClassifiedID);
+                        m_classifiedCache.Remove(queryClassifiedID);
+                    }
                 }
             }
             
@@ -1339,4 +1339,4 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
         }
         #endregion Web Util
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/InventoryCache.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/InventoryCache.cs
index 1e434b9..2fc8ee3 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/InventoryCache.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/InventoryCache.cs
@@ -1,11 +1,41 @@
-using System;
-using System.Collections.Generic;
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
 
+using System;
+using System.Collections.Generic;
+using System.Threading;
 using OpenSim.Framework;
 using OpenMetaverse;
 
 namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
 {
+    /// <summary>
+    /// Cache root and system inventory folders to reduce number of potentially remote inventory calls and associated holdups.
+    /// </summary>
     public class InventoryCache
     {
         private const double CACHE_EXPIRATION_SECONDS = 3600.0; // 1 hour
@@ -16,8 +46,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
 
         public void Cache(UUID userID, InventoryFolderBase root)
         {
-            lock (m_RootFolders)
-                m_RootFolders.AddOrUpdate(userID, root, CACHE_EXPIRATION_SECONDS);
+            m_RootFolders.AddOrUpdate(userID, root, CACHE_EXPIRATION_SECONDS);
         }
 
         public InventoryFolderBase GetRootFolder(UUID userID)
@@ -31,14 +60,18 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
 
         public void Cache(UUID userID, AssetType type, InventoryFolderBase folder)
         {
-            lock (m_FolderTypes)
+            Dictionary<AssetType, InventoryFolderBase> ff = null;
+            if (!m_FolderTypes.TryGetValue(userID, out ff))
+            {
+                ff = new Dictionary<AssetType, InventoryFolderBase>();
+                m_FolderTypes.Add(userID, ff, CACHE_EXPIRATION_SECONDS);
+            }
+
+            // We need to lock here since two threads could potentially retrieve the same dictionary
+            // and try to add a folder for that type simultaneously.  Dictionary<>.Add() is not described as thread-safe in the SDK
+            // even if the folders are identical.
+            lock (ff)
             {
-                Dictionary<AssetType, InventoryFolderBase> ff = null;
-                if (!m_FolderTypes.TryGetValue(userID, out ff))
-                {
-                    ff = new Dictionary<AssetType, InventoryFolderBase>();
-                    m_FolderTypes.Add(userID, ff, CACHE_EXPIRATION_SECONDS);
-                }
                 if (!ff.ContainsKey(type))
                     ff.Add(type, folder);
             }
@@ -50,8 +83,12 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
             if (m_FolderTypes.TryGetValue(userID, out ff))
             {
                 InventoryFolderBase f = null;
-                if (ff.TryGetValue(type, out f))
-                    return f;
+
+                lock (ff)
+                {
+                    if (ff.TryGetValue(type, out f))
+                        return f;
+                }
             }
 
             return null;
@@ -59,8 +96,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
 
         public void Cache(UUID userID, InventoryCollection inv)
         {
-            lock (m_Inventories)
-                m_Inventories.AddOrUpdate(userID, inv, 120);
+            m_Inventories.AddOrUpdate(userID, inv, 120);
         }
 
         public InventoryCollection GetUserInventory(UUID userID)