OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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
sedebug
Justin Clark-Casey (justincc) 2015-01-12 23:39:27 +00:00
parent 0c31eb0a5d
commit 02dcfcf537
1 changed files with 9 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
OpenSim/Data/PGSQL/PGSQLUserProfilesData.cs
View File

@ -49,11 +49,6 @@ namespace OpenSim.Data.PGSQL
get; set; get; set;
} }
protected object Lock
{
get; set;
}
protected virtual Assembly Assembly protected virtual Assembly Assembly
{ {
get { return GetType().Assembly; } get { return GetType().Assembly; }
@ -235,14 +230,10 @@ namespace OpenSim.Data.PGSQL
using (NpgsqlCommand cmd = new NpgsqlCommand(query, dbcon)) using (NpgsqlCommand cmd = new NpgsqlCommand(query, dbcon))
{ {
cmd.Parameters.Add(m_database.CreateParameter("ClassifiedId", recordId)); cmd.Parameters.Add(m_database.CreateParameter("ClassifiedId", recordId));
lock(Lock)
{
cmd.ExecuteNonQuery(); cmd.ExecuteNonQuery();
} }
} }
} }
}
catch (Exception e) catch (Exception e)
{ {
m_log.Error("[PROFILES_DATA]: DeleteClassifiedRecord exception ", e); m_log.Error("[PROFILES_DATA]: DeleteClassifiedRecord exception ", e);
@ -916,8 +907,6 @@ namespace OpenSim.Data.PGSQL
query = "INSERT INTO usersettings VALUES "; query = "INSERT INTO usersettings VALUES ";
query += "(:Id,'false','false', '')"; query += "(:Id,'false','false', '')";
lock(Lock)
{
put.ExecuteNonQuery(); put.ExecuteNonQuery();
} }
} }
@ -925,7 +914,6 @@ namespace OpenSim.Data.PGSQL
} }
} }
} }
}
catch (Exception e) catch (Exception e)
{ {
m_log.Error("[PROFILES_DATA]: GetUserPreferences exception ", e); m_log.Error("[PROFILES_DATA]: GetUserPreferences exception ", e);
@ -957,13 +945,10 @@ namespace OpenSim.Data.PGSQL
cmd.Parameters.Add(m_database.CreateParameter("EMail", pref.EMail.ToString().ToLower ())); cmd.Parameters.Add(m_database.CreateParameter("EMail", pref.EMail.ToString().ToLower ()));
cmd.Parameters.Add(m_database.CreateParameter("uuid", pref.UserId.ToString())); cmd.Parameters.Add(m_database.CreateParameter("uuid", pref.UserId.ToString()));
lock(Lock)
{
cmd.ExecuteNonQuery(); cmd.ExecuteNonQuery();
} }
} }
} }
}
catch (Exception e) catch (Exception e)
{ {
m_log.Error("[PROFILES_DATA]: AgentInterestsUpdate exception ", e); m_log.Error("[PROFILES_DATA]: AgentInterestsUpdate exception ", e);
@ -1019,8 +1004,6 @@ namespace OpenSim.Data.PGSQL
put.Parameters.Add(m_database.CreateParameter("DataKey", props.DataKey.ToString())); put.Parameters.Add(m_database.CreateParameter("DataKey", props.DataKey.ToString()));
put.Parameters.Add(m_database.CreateParameter("DataVal", props.DataVal.ToString())); put.Parameters.Add(m_database.CreateParameter("DataVal", props.DataVal.ToString()));
lock(Lock)
{
put.ExecuteNonQuery(); put.ExecuteNonQuery();
} }
} }
@ -1028,7 +1011,6 @@ namespace OpenSim.Data.PGSQL
} }
} }
} }
}
catch (Exception e) catch (Exception e)
{ {
m_log.Error("[PROFILES_DATA]: GetUserAppData exception ", e); m_log.Error("[PROFILES_DATA]: GetUserAppData exception ", e);
@ -1062,13 +1044,10 @@ namespace OpenSim.Data.PGSQL
cmd.Parameters.Add(m_database.CreateParameter("DataKey", props.DataKey.ToString ())); cmd.Parameters.Add(m_database.CreateParameter("DataKey", props.DataKey.ToString ()));
cmd.Parameters.Add(m_database.CreateParameter("DataVal", props.DataKey.ToString ())); cmd.Parameters.Add(m_database.CreateParameter("DataVal", props.DataKey.ToString ()));
lock(Lock)
{
cmd.ExecuteNonQuery(); cmd.ExecuteNonQuery();
} }
} }
} }
}
catch (Exception e) catch (Exception e)
{ {
m_log.Error("[PROFILES_DATA]: SetUserData exception ", e); m_log.Error("[PROFILES_DATA]: SetUserData exception ", e);