diff options
author | Justin Clark-Casey (justincc) | 2014-08-22 20:28:56 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2014-08-22 20:28:56 +0100 |
commit | 0cb805a64cff87b5696528afa01c76732dae98aa (patch) | |
tree | 2dee6cbba408205df61e6c3f07086808cfbae707 /OpenSim/Data/MySQL/MySQLUserProfilesData.cs | |
parent | Remove some use of database connection locking from MySQLSimulationData - thi... (diff) | |
download | opensim-SC_OLD-0cb805a64cff87b5696528afa01c76732dae98aa.zip opensim-SC_OLD-0cb805a64cff87b5696528afa01c76732dae98aa.tar.gz opensim-SC_OLD-0cb805a64cff87b5696528afa01c76732dae98aa.tar.bz2 opensim-SC_OLD-0cb805a64cff87b5696528afa01c76732dae98aa.tar.xz |
Remove query locking in MySQLUserProfileData. This is not necessary as the connection is not shared.
Diffstat (limited to 'OpenSim/Data/MySQL/MySQLUserProfilesData.cs')
-rw-r--r-- | OpenSim/Data/MySQL/MySQLUserProfilesData.cs | 28 |
1 files changed, 8 insertions, 20 deletions
diff --git a/OpenSim/Data/MySQL/MySQLUserProfilesData.cs b/OpenSim/Data/MySQL/MySQLUserProfilesData.cs index adb75d6..7e846e3 100644 --- a/OpenSim/Data/MySQL/MySQLUserProfilesData.cs +++ b/OpenSim/Data/MySQL/MySQLUserProfilesData.cs | |||
@@ -46,11 +46,6 @@ namespace OpenSim.Data.MySQL | |||
46 | { | 46 | { |
47 | get; set; | 47 | get; set; |
48 | } | 48 | } |
49 | |||
50 | protected object Lock | ||
51 | { | ||
52 | get; set; | ||
53 | } | ||
54 | 49 | ||
55 | protected virtual Assembly Assembly | 50 | protected virtual Assembly Assembly |
56 | { | 51 | { |
@@ -1025,11 +1020,8 @@ namespace OpenSim.Data.MySQL | |||
1025 | put.Parameters.AddWithValue("?TagId", props.TagId.ToString()); | 1020 | put.Parameters.AddWithValue("?TagId", props.TagId.ToString()); |
1026 | put.Parameters.AddWithValue("?DataKey", props.DataKey.ToString()); | 1021 | put.Parameters.AddWithValue("?DataKey", props.DataKey.ToString()); |
1027 | put.Parameters.AddWithValue("?DataVal", props.DataVal.ToString()); | 1022 | put.Parameters.AddWithValue("?DataVal", props.DataVal.ToString()); |
1028 | 1023 | ||
1029 | lock(Lock) | 1024 | put.ExecuteNonQuery(); |
1030 | { | ||
1031 | put.ExecuteNonQuery(); | ||
1032 | } | ||
1033 | } | 1025 | } |
1034 | } | 1026 | } |
1035 | } | 1027 | } |
@@ -1065,14 +1057,11 @@ namespace OpenSim.Data.MySQL | |||
1065 | using (MySqlCommand cmd = new MySqlCommand(query, dbcon)) | 1057 | using (MySqlCommand cmd = new MySqlCommand(query, dbcon)) |
1066 | { | 1058 | { |
1067 | cmd.Parameters.AddWithValue("?UserId", props.UserId.ToString()); | 1059 | cmd.Parameters.AddWithValue("?UserId", props.UserId.ToString()); |
1068 | cmd.Parameters.AddWithValue("?TagId", props.TagId.ToString ()); | 1060 | cmd.Parameters.AddWithValue("?TagId", props.TagId.ToString()); |
1069 | cmd.Parameters.AddWithValue("?DataKey", props.DataKey.ToString ()); | 1061 | cmd.Parameters.AddWithValue("?DataKey", props.DataKey.ToString()); |
1070 | cmd.Parameters.AddWithValue("?DataVal", props.DataKey.ToString ()); | 1062 | cmd.Parameters.AddWithValue("?DataVal", props.DataKey.ToString()); |
1071 | 1063 | ||
1072 | lock(Lock) | 1064 | cmd.ExecuteNonQuery(); |
1073 | { | ||
1074 | cmd.ExecuteNonQuery(); | ||
1075 | } | ||
1076 | } | 1065 | } |
1077 | } | 1066 | } |
1078 | } | 1067 | } |
@@ -1086,5 +1075,4 @@ namespace OpenSim.Data.MySQL | |||
1086 | } | 1075 | } |
1087 | #endregion Integration | 1076 | #endregion Integration |
1088 | } | 1077 | } |
1089 | } | 1078 | } \ No newline at end of file |
1090 | |||