Properly lock new separate database accesses

1 files changed, 62 insertions, 59 deletions

diff --git a/OpenSim/Framework/Data.MySQL/MySQLDataStore.cs b/OpenSim/Framework/Data.MySQL/MySQLDataStore.cs
index 698569a..a752236 100644
--- a/OpenSim/Framework/Data.MySQL/MySQLDataStore.cs
+++ b/OpenSim/Framework/Data.MySQL/MySQLDataStore.cs
@@ -1203,72 +1203,75 @@ namespace OpenSim.Framework.Data.MySQL
                      
             MainLog.Instance.Verbose("DATASTORE", "Entered StorePrimInventory with prim ID {0}", primID);
             
-            // Find all existing inventory rows for this prim
-            DataTable dbItems = m_itemsTable;
-
-            String sql = String.Format("primID = '{0}'", primID);            
-            DataRow[] dbItemRows = dbItems.Select(sql);
-            
-            // Build structures for manipulation purposes
-            IDictionary<String, DataRow> dbItemsToRemove = new Dictionary<String, DataRow>();
-            ICollection<TaskInventoryItem> itemsToAdd = new List<TaskInventoryItem>();
-            
-            foreach (DataRow row in dbItemRows)
-            {
-//                MainLog.Instance.Verbose(
-//                    "DATASTORE", 
-//                    "Found item {0}, {1} in prim id {2}", 
-//                    row["name"], row["itemID"], primID);
+            lock (m_dataSet)
+            {            
+                // Find all existing inventory rows for this prim
+                DataTable dbItems = m_itemsTable;
+    
+                String sql = String.Format("primID = '{0}'", primID);            
+                DataRow[] dbItemRows = dbItems.Select(sql);
                 
-                dbItemsToRemove.Add((String)row["itemID"], row);
-            }
-            
-            // Eliminate rows from the deletion set which already exist for this prim's inventory
-            // TODO Very temporary, need to take account of simple metadata changes soon
-            lock (items)
-            {
-                foreach (LLUUID itemId in items.Keys)
+                // Build structures for manipulation purposes
+                IDictionary<String, DataRow> dbItemsToRemove = new Dictionary<String, DataRow>();
+                ICollection<TaskInventoryItem> itemsToAdd = new List<TaskInventoryItem>();
+                
+                foreach (DataRow row in dbItemRows)
                 {
-                    String rawItemId = itemId.ToString();
+    //                MainLog.Instance.Verbose(
+    //                    "DATASTORE", 
+    //                    "Found item {0}, {1} in prim id {2}", 
+    //                    row["name"], row["itemID"], primID);
                     
-                    if (dbItemsToRemove.ContainsKey(rawItemId))
+                    dbItemsToRemove.Add((String)row["itemID"], row);
+                }
+                
+                // Eliminate rows from the deletion set which already exist for this prim's inventory
+                // TODO Very temporary, need to take account of simple metadata changes soon
+                lock (items)
+                {
+                    foreach (LLUUID itemId in items.Keys)
                     {
-//                        MainLog.Instance.Verbose(
-//                            "DATASTORE", 
-//                            "Discarding item {0}, {1} from remove candidates for prim id {2}", 
-//                            items[itemId].Name, rawItemId, primID);
+                        String rawItemId = itemId.ToString();
                         
-                        dbItemsToRemove.Remove(rawItemId);
-                    }
-                    else
-                    {
-                        itemsToAdd.Add(items[itemId]);
-                    }
-                }    
-            }
-            
-            // Delete excess rows
-            foreach (DataRow row in dbItemsToRemove.Values)
-            {
-                MainLog.Instance.Verbose(
-                    "DATASTORE", 
-                    "Removing item {0}, {1} from prim ID {2}", 
-                    row["name"], row["itemID"], row["primID"]);
+                        if (dbItemsToRemove.ContainsKey(rawItemId))
+                        {
+    //                        MainLog.Instance.Verbose(
+    //                            "DATASTORE", 
+    //                            "Discarding item {0}, {1} from remove candidates for prim id {2}", 
+    //                            items[itemId].Name, rawItemId, primID);
+                            
+                            dbItemsToRemove.Remove(rawItemId);
+                        }
+                        else
+                        {
+                            itemsToAdd.Add(items[itemId]);
+                        }
+                    }    
+                }
                 
-                row.Delete();
-            }
-            
-            // Insert items not already present 
-            foreach (TaskInventoryItem newItem in itemsToAdd)
-            {
-                MainLog.Instance.Verbose(
-                    "DATASTORE", 
-                    "Adding item {0}, {1} to prim ID {2}", 
-                    newItem.Name, newItem.ItemID, newItem.ParentPartID);
+                // Delete excess rows
+                foreach (DataRow row in dbItemsToRemove.Values)
+                {
+                    MainLog.Instance.Verbose(
+                        "DATASTORE", 
+                        "Removing item {0}, {1} from prim ID {2}", 
+                        row["name"], row["itemID"], row["primID"]);
+                    
+                    row.Delete();
+                }
                 
-                DataRow newItemRow = dbItems.NewRow();
-                fillItemRow(newItemRow, newItem);
-                dbItems.Rows.Add(newItemRow);                
+                // Insert items not already present 
+                foreach (TaskInventoryItem newItem in itemsToAdd)
+                {
+                    MainLog.Instance.Verbose(
+                        "DATASTORE", 
+                        "Adding item {0}, {1} to prim ID {2}", 
+                        newItem.Name, newItem.ItemID, newItem.ParentPartID);
+                    
+                    DataRow newItemRow = dbItems.NewRow();
+                    fillItemRow(newItemRow, newItem);
+                    dbItems.Rows.Add(newItemRow);                
+                }
             }
         }