aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/PGSQL
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2015-01-12 23:39:27 +0000
committerJustin Clark-Casey (justincc)2015-01-12 23:39:27 +0000
commit02dcfcf53761db599190b6f13a1d53297809008e (patch)
tree994ad5dbbaafe0ea63e96f66f2f0a98e897412f0 /OpenSim/Data/PGSQL
parentAdd the missing deleted and re-added JobEngine class from the previous commit... (diff)
downloadopensim-SC_OLD-02dcfcf53761db599190b6f13a1d53297809008e.zip
opensim-SC_OLD-02dcfcf53761db599190b6f13a1d53297809008e.tar.gz
opensim-SC_OLD-02dcfcf53761db599190b6f13a1d53297809008e.tar.bz2
opensim-SC_OLD-02dcfcf53761db599190b6f13a1d53297809008e.tar.xz
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
Diffstat (limited to 'OpenSim/Data/PGSQL')
-rw-r--r--OpenSim/Data/PGSQL/PGSQLUserProfilesData.cs39
1 files changed, 9 insertions, 30 deletions
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
48 { 48 {
49 get; set; 49 get; set;
50 } 50 }
51
52 protected object Lock
53 {
54 get; set;
55 }
56 51
57 protected virtual Assembly Assembly 52 protected virtual Assembly Assembly
58 { 53 {
@@ -235,11 +230,7 @@ namespace OpenSim.Data.PGSQL
235 using (NpgsqlCommand cmd = new NpgsqlCommand(query, dbcon)) 230 using (NpgsqlCommand cmd = new NpgsqlCommand(query, dbcon))
236 { 231 {
237 cmd.Parameters.Add(m_database.CreateParameter("ClassifiedId", recordId)); 232 cmd.Parameters.Add(m_database.CreateParameter("ClassifiedId", recordId));
238 233 cmd.ExecuteNonQuery();
239 lock(Lock)
240 {
241 cmd.ExecuteNonQuery();
242 }
243 } 234 }
244 } 235 }
245 } 236 }
@@ -915,11 +906,8 @@ namespace OpenSim.Data.PGSQL
915 { 906 {
916 query = "INSERT INTO usersettings VALUES "; 907 query = "INSERT INTO usersettings VALUES ";
917 query += "(:Id,'false','false', '')"; 908 query += "(:Id,'false','false', '')";
918 909
919 lock(Lock) 910 put.ExecuteNonQuery();
920 {
921 put.ExecuteNonQuery();
922 }
923 } 911 }
924 } 912 }
925 } 913 }
@@ -956,11 +944,8 @@ namespace OpenSim.Data.PGSQL
956 cmd.Parameters.Add(m_database.CreateParameter("Visible", pref.Visible.ToString().ToLower ())); 944 cmd.Parameters.Add(m_database.CreateParameter("Visible", pref.Visible.ToString().ToLower ()));
957 cmd.Parameters.Add(m_database.CreateParameter("EMail", pref.EMail.ToString().ToLower ())); 945 cmd.Parameters.Add(m_database.CreateParameter("EMail", pref.EMail.ToString().ToLower ()));
958 cmd.Parameters.Add(m_database.CreateParameter("uuid", pref.UserId.ToString())); 946 cmd.Parameters.Add(m_database.CreateParameter("uuid", pref.UserId.ToString()));
959 947
960 lock(Lock) 948 cmd.ExecuteNonQuery();
961 {
962 cmd.ExecuteNonQuery();
963 }
964 } 949 }
965 } 950 }
966 } 951 }
@@ -1018,11 +1003,8 @@ namespace OpenSim.Data.PGSQL
1018 put.Parameters.Add(m_database.CreateParameter("TagId", props.TagId)); 1003 put.Parameters.Add(m_database.CreateParameter("TagId", props.TagId));
1019 put.Parameters.Add(m_database.CreateParameter("DataKey", props.DataKey.ToString())); 1004 put.Parameters.Add(m_database.CreateParameter("DataKey", props.DataKey.ToString()));
1020 put.Parameters.Add(m_database.CreateParameter("DataVal", props.DataVal.ToString())); 1005 put.Parameters.Add(m_database.CreateParameter("DataVal", props.DataVal.ToString()));
1021 1006
1022 lock(Lock) 1007 put.ExecuteNonQuery();
1023 {
1024 put.ExecuteNonQuery();
1025 }
1026 } 1008 }
1027 } 1009 }
1028 } 1010 }
@@ -1061,11 +1043,8 @@ namespace OpenSim.Data.PGSQL
1061 cmd.Parameters.Add(m_database.CreateParameter("TagId", props.TagId.ToString ())); 1043 cmd.Parameters.Add(m_database.CreateParameter("TagId", props.TagId.ToString ()));
1062 cmd.Parameters.Add(m_database.CreateParameter("DataKey", props.DataKey.ToString ())); 1044 cmd.Parameters.Add(m_database.CreateParameter("DataKey", props.DataKey.ToString ()));
1063 cmd.Parameters.Add(m_database.CreateParameter("DataVal", props.DataKey.ToString ())); 1045 cmd.Parameters.Add(m_database.CreateParameter("DataVal", props.DataKey.ToString ()));
1064 1046
1065 lock(Lock) 1047 cmd.ExecuteNonQuery();
1066 {
1067 cmd.ExecuteNonQuery();
1068 }
1069 } 1048 }
1070 } 1049 }
1071 } 1050 }