From 02dcfcf53761db599190b6f13a1d53297809008e Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Mon, 12 Jan 2015 23:39:27 +0000
Subject: Remove the locking in PGSQLUserProfilesData which was buggy (Lock
 object wasn't set!) and is unnecessary.

Relates to http://opensimulator.org/mantis/view.php?id=7398
---
 OpenSim/Data/PGSQL/PGSQLUserProfilesData.cs | 39 +++++++----------------------
 1 file changed, 9 insertions(+), 30 deletions(-)

(limited to 'OpenSim')

diff --git a/OpenSim/Data/PGSQL/PGSQLUserProfilesData.cs b/OpenSim/Data/PGSQL/PGSQLUserProfilesData.cs
index a66b002..4cda5e0 100644
--- a/OpenSim/Data/PGSQL/PGSQLUserProfilesData.cs
+++ b/OpenSim/Data/PGSQL/PGSQLUserProfilesData.cs
@@ -48,11 +48,6 @@ namespace OpenSim.Data.PGSQL
         {
             get; set;
         }
-
-        protected object Lock
-        {
-            get; set;
-        }
         
         protected virtual Assembly Assembly
         {
@@ -235,11 +230,7 @@ namespace OpenSim.Data.PGSQL
                     using (NpgsqlCommand cmd = new NpgsqlCommand(query, dbcon))
                     {
                         cmd.Parameters.Add(m_database.CreateParameter("ClassifiedId", recordId));
-                        
-                        lock(Lock)
-                        {
-                            cmd.ExecuteNonQuery();
-                        }
+                        cmd.ExecuteNonQuery();
                     }
                 }
             }
@@ -915,11 +906,8 @@ namespace OpenSim.Data.PGSQL
                                 {
                                     query = "INSERT INTO usersettings VALUES ";
                                     query += "(:Id,'false','false', '')";
-                                    
-                                    lock(Lock)
-                                    {
-                                        put.ExecuteNonQuery();
-                                    }
+
+                                    put.ExecuteNonQuery();
                                 }
                             }
                         }
@@ -956,11 +944,8 @@ namespace OpenSim.Data.PGSQL
                         cmd.Parameters.Add(m_database.CreateParameter("Visible", pref.Visible.ToString().ToLower ()));
                         cmd.Parameters.Add(m_database.CreateParameter("EMail", pref.EMail.ToString().ToLower ()));
                         cmd.Parameters.Add(m_database.CreateParameter("uuid", pref.UserId.ToString()));
-                        
-                        lock(Lock)
-                        {
-                            cmd.ExecuteNonQuery();
-                        }
+
+                        cmd.ExecuteNonQuery();
                     }
                 }
             }
@@ -1018,11 +1003,8 @@ namespace OpenSim.Data.PGSQL
                                     put.Parameters.Add(m_database.CreateParameter("TagId", props.TagId));
                                     put.Parameters.Add(m_database.CreateParameter("DataKey", props.DataKey.ToString()));
                                     put.Parameters.Add(m_database.CreateParameter("DataVal", props.DataVal.ToString()));
-                                    
-                                    lock(Lock)
-                                    {
-                                        put.ExecuteNonQuery();
-                                    }
+
+                                    put.ExecuteNonQuery();
                                 }
                             }
                         }
@@ -1061,11 +1043,8 @@ namespace OpenSim.Data.PGSQL
                         cmd.Parameters.Add(m_database.CreateParameter("TagId", props.TagId.ToString ()));
                         cmd.Parameters.Add(m_database.CreateParameter("DataKey", props.DataKey.ToString ()));
                         cmd.Parameters.Add(m_database.CreateParameter("DataVal", props.DataKey.ToString ()));
-                        
-                        lock(Lock)
-                        {
-                            cmd.ExecuteNonQuery();
-                        }
+
+                        cmd.ExecuteNonQuery();
                     }
                 }
             }
-- 
cgit v1.1