Improve consistency of locking for SOG.m_parts in order to avoid race conditions in linking and unlinking

1 files changed, 48 insertions, 46 deletions

diff --git a/OpenSim/Data/MSSQL/MSSQLLegacyRegionData.cs b/OpenSim/Data/MSSQL/MSSQLLegacyRegionData.cs
index 7d017a6..4ce93e5 100644
--- a/OpenSim/Data/MSSQL/MSSQLLegacyRegionData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLLegacyRegionData.cs
@@ -232,66 +232,68 @@ namespace OpenSim.Data.MSSQL
         /// <param name="regionUUID"></param>
         public void StoreObject(SceneObjectGroup obj, UUID regionUUID)
         {
-            _Log.InfoFormat("[MSSQL]: Adding/Changing SceneObjectGroup: {0} to region: {1}, object has {2} prims.", obj.UUID, regionUUID, obj.Children.Count);
-
-            using (SqlConnection conn = new SqlConnection(m_connectionString))
+            lock (obj.Children)
             {
-                conn.Open();
-                SqlTransaction transaction = conn.BeginTransaction();
-
-                try
+                _Log.DebugFormat("[MSSQL]: Adding/Changing SceneObjectGroup: {0} to region: {1}, object has {2} prims.", obj.UUID, regionUUID, obj.Children.Count);
+    
+                using (SqlConnection conn = new SqlConnection(m_connectionString))
                 {
-                    foreach (SceneObjectPart sceneObjectPart in obj.Children.Values)
+                    conn.Open();
+                    SqlTransaction transaction = conn.BeginTransaction();
+    
+                    try
                     {
-                        //Update prim
-                        using (SqlCommand sqlCommand = conn.CreateCommand())
-                        {
-                            sqlCommand.Transaction = transaction;
-                            try
-                            {
-                                StoreSceneObjectPrim(sceneObjectPart, sqlCommand, obj.UUID, regionUUID);
-                            }
-                            catch (SqlException sqlEx)
-                            {
-                                _Log.ErrorFormat("[REGION DB]: Store SceneObjectPrim SQL error: {0} at line {1}", sqlEx.Message, sqlEx.LineNumber);
-                                throw;
-                            }
-                        }
-
-                        //Update primshapes
-                        using (SqlCommand sqlCommand = conn.CreateCommand())
+                        foreach (SceneObjectPart sceneObjectPart in obj.Children.Values)
                         {
-                            sqlCommand.Transaction = transaction;
-                            try
+                            //Update prim
+                            using (SqlCommand sqlCommand = conn.CreateCommand())
                             {
-                                StoreSceneObjectPrimShapes(sceneObjectPart, sqlCommand, obj.UUID, regionUUID);
+                                sqlCommand.Transaction = transaction;
+                                try
+                                {
+                                    StoreSceneObjectPrim(sceneObjectPart, sqlCommand, obj.UUID, regionUUID);
+                                }
+                                catch (SqlException sqlEx)
+                                {
+                                    _Log.ErrorFormat("[REGION DB]: Store SceneObjectPrim SQL error: {0} at line {1}", sqlEx.Message, sqlEx.LineNumber);
+                                    throw;
+                                }
                             }
-                            catch (SqlException sqlEx)
+    
+                            //Update primshapes
+                            using (SqlCommand sqlCommand = conn.CreateCommand())
                             {
-                                _Log.ErrorFormat("[REGION DB]: Store SceneObjectPrimShapes SQL error: {0} at line {1}", sqlEx.Message, sqlEx.LineNumber);
-                                throw;
+                                sqlCommand.Transaction = transaction;
+                                try
+                                {
+                                    StoreSceneObjectPrimShapes(sceneObjectPart, sqlCommand, obj.UUID, regionUUID);
+                                }
+                                catch (SqlException sqlEx)
+                                {
+                                    _Log.ErrorFormat("[REGION DB]: Store SceneObjectPrimShapes SQL error: {0} at line {1}", sqlEx.Message, sqlEx.LineNumber);
+                                    throw;
+                                }
                             }
                         }
+    
+                        transaction.Commit();
                     }
-
-                    transaction.Commit();
-                }
-                catch (Exception ex)
-                {
-                    _Log.ErrorFormat("[REGION DB]: Store SceneObjectGroup error: {0}, Rolling back...", ex.Message);
-                    try
-                    {
-                        transaction.Rollback();
-                    }
-                    catch (Exception ex2)
+                    catch (Exception ex)
                     {
-                        //Show error
-                        _Log.InfoFormat("[REGION DB]: Rollback of SceneObjectGroup store transaction failed with error: {0}", ex2.Message);
-
+                        _Log.ErrorFormat("[REGION DB]: Store SceneObjectGroup error: {0}, Rolling back...", ex.Message);
+                        try
+                        {
+                            transaction.Rollback();
+                        }
+                        catch (Exception ex2)
+                        {
+                            //Show error
+                            _Log.InfoFormat("[REGION DB]: Rollback of SceneObjectGroup store transaction failed with error: {0}", ex2.Message);
+    
+                        }
                     }
                 }
             }
-
         }
 
         /// <summary>