Remove lock in MySQLFramework. This is not necessary as the connection is not shared.

bullet-2.82
Justin Clark-Casey (justincc) 2014-08-22 19:52:03 +01:00
parent f129b824c3
commit d899bdcb9b
1 changed files with 12 additions and 21 deletions

View File

@ -45,38 +45,29 @@ namespace OpenSim.Data.MySQL
System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
protected string m_connectionString; protected string m_connectionString;
protected object m_dbLock = new object();
protected MySqlFramework(string connectionString) protected MySqlFramework(string connectionString)
{ {
m_connectionString = connectionString; m_connectionString = connectionString;
} }
//////////////////////////////////////////////////////////////
//
// All non queries are funneled through one connection
// to increase performance a little
//
protected int ExecuteNonQuery(MySqlCommand cmd) protected int ExecuteNonQuery(MySqlCommand cmd)
{ {
lock (m_dbLock) using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
{ {
using (MySqlConnection dbcon = new MySqlConnection(m_connectionString)) dbcon.Open();
{ cmd.Connection = dbcon;
dbcon.Open();
cmd.Connection = dbcon;
try try
{ {
return cmd.ExecuteNonQuery(); return cmd.ExecuteNonQuery();
} }
catch (Exception e) catch (Exception e)
{ {
m_log.Error(e.Message, e); m_log.Error(e.Message, e);
return 0; return 0;
}
} }
} }
} }
} }
} }