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

Remove the using() constructs from the new style database modules; they caused 

the underlying connection of a reader or command to be closed before the
reader or command itself. Added the proper logic to Close and dispose items
in CloseDBConnection. Readers and Connections need Close(), Commands need
Dispose(), in the order Reader, Command, Connection.
Also reinstated 80-column-friendly formatting
prioritization
Melanie 2009-10-06 14:30:25 +01:00
parent 0c46df973a
commit 8a7a947faa
4 changed files with 75 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
OpenSim/Data/MySQL/MySQLAuthenticationData.cs
View File

@ -55,42 +55,40 @@ namespace OpenSim.Data.MySQL
AuthenticationData ret = new AuthenticationData(); AuthenticationData ret = new AuthenticationData();
ret.Data = new Dictionary<string, object>(); ret.Data = new Dictionary<string, object>();
using (MySqlCommand cmd = new MySqlCommand("select * from `" + m_Realm + "` where UUID = ?principalID")) MySqlCommand cmd = new MySqlCommand("select * from `" + m_Realm + "` where UUID = ?principalID");
cmd.Parameters.AddWithValue("?principalID", principalID.ToString());
IDataReader result = ExecuteReader(cmd);
if (result.Read())
{ {
cmd.Parameters.AddWithValue("?principalID", principalID.ToString()); ret.PrincipalID = principalID;
using (IDataReader result = ExecuteReader(cmd)) if (m_ColumnNames == null)
{ {
if (result.Read()) m_ColumnNames = new List<string>();
{
ret.PrincipalID = principalID;
if (m_ColumnNames == null) DataTable schemaTable = result.GetSchemaTable();
{ foreach (DataRow row in schemaTable.Rows)
m_ColumnNames = new List<string>(); m_ColumnNames.Add(row["ColumnName"].ToString());
DataTable schemaTable = result.GetSchemaTable();
foreach (DataRow row in schemaTable.Rows)
m_ColumnNames.Add(row["ColumnName"].ToString());
}
foreach (string s in m_ColumnNames)
{
if (s == "UUID")
continue;
ret.Data[s] = result[s].ToString();
}
CloseDBConnection(cmd);
return ret;
}
else
{
CloseDBConnection(cmd);
return null;
}
} }
foreach (string s in m_ColumnNames)
{
if (s == "UUID")
continue;
ret.Data[s] = result[s].ToString();
}
CloseDBConnection(result, cmd);
return ret;
}
else
{
CloseDBConnection(result, cmd);
return null;
} }
} }

14
OpenSim/Data/MySQL/MySQLFramework.cs
View File

@ -40,7 +40,9 @@ namespace OpenSim.Data.MySQL
/// </summary> /// </summary>
public class MySqlFramework public class MySqlFramework
{ {
private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); private static readonly log4net.ILog m_log =
log4net.LogManager.GetLogger(
System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
protected MySqlConnection m_Connection; protected MySqlConnection m_Connection;
@ -81,7 +83,8 @@ namespace OpenSim.Data.MySQL
errorSeen = true; errorSeen = true;
m_Connection.Close(); m_Connection.Close();
MySqlConnection newConnection = (MySqlConnection)((ICloneable)m_Connection).Clone(); MySqlConnection newConnection =
(MySqlConnection)((ICloneable)m_Connection).Clone();
m_Connection.Dispose(); m_Connection.Dispose();
m_Connection = newConnection; m_Connection = newConnection;
m_Connection.Open(); m_Connection.Open();
@ -102,15 +105,18 @@ namespace OpenSim.Data.MySQL
protected IDataReader ExecuteReader(MySqlCommand cmd) protected IDataReader ExecuteReader(MySqlCommand cmd)
{ {
MySqlConnection newConnection = (MySqlConnection)((ICloneable)m_Connection).Clone(); MySqlConnection newConnection =
(MySqlConnection)((ICloneable)m_Connection).Clone();
newConnection.Open(); newConnection.Open();
cmd.Connection = newConnection; cmd.Connection = newConnection;
return cmd.ExecuteReader(); return cmd.ExecuteReader();
} }
protected void CloseDBConnection(MySqlCommand cmd) protected void CloseDBConnection(IDataReader reader, MySqlCommand cmd)
{ {
reader.Close();
cmd.Connection.Close();
cmd.Connection.Dispose(); cmd.Connection.Dispose();
} }
} }

2
OpenSim/Data/MySQL/MySQLRegionData.cs
View File

@ -173,7 +173,7 @@ namespace OpenSim.Data.MySQL
retList.Add(ret); retList.Add(ret);
} }
CloseDBConnection(cmd); CloseDBConnection(result, cmd);
} }
return retList; return retList;

72
OpenSim/Data/MySQL/MySQLUserAccountData.cs
View File

@ -64,48 +64,46 @@ namespace OpenSim.Data.MySQL
if (scopeID != UUID.Zero) if (scopeID != UUID.Zero)
command += " and ScopeID = ?scopeID"; command += " and ScopeID = ?scopeID";
using (MySqlCommand cmd = new MySqlCommand(command)) MySqlCommand cmd = new MySqlCommand(command);
cmd.Parameters.AddWithValue("?principalID", principalID.ToString());
cmd.Parameters.AddWithValue("?scopeID", scopeID.ToString());
IDataReader result = ExecuteReader(cmd);
if (result.Read())
{ {
cmd.Parameters.AddWithValue("?principalID", principalID.ToString()); ret.PrincipalID = principalID;
cmd.Parameters.AddWithValue("?scopeID", scopeID.ToString()); UUID scope;
UUID.TryParse(result["ScopeID"].ToString(), out scope);
ret.ScopeID = scope;
using (IDataReader result = ExecuteReader(cmd)) if (m_ColumnNames == null)
{ {
if (result.Read()) m_ColumnNames = new List<string>();
{
ret.PrincipalID = principalID;
UUID scope;
UUID.TryParse(result["ScopeID"].ToString(), out scope);
ret.ScopeID = scope;
if (m_ColumnNames == null) DataTable schemaTable = result.GetSchemaTable();
{ foreach (DataRow row in schemaTable.Rows)
m_ColumnNames = new List<string>(); m_ColumnNames.Add(row["ColumnName"].ToString());
DataTable schemaTable = result.GetSchemaTable();
foreach (DataRow row in schemaTable.Rows)
m_ColumnNames.Add(row["ColumnName"].ToString());
}
foreach (string s in m_ColumnNames)
{
if (s == "UUID")
continue;
if (s == "ScopeID")
continue;
ret.Data[s] = result[s].ToString();
}
CloseDBConnection(cmd);
return ret;
}
else
{
CloseDBConnection(cmd);
return null;
}
} }
foreach (string s in m_ColumnNames)
{
if (s == "UUID")
continue;
if (s == "ScopeID")
continue;
ret.Data[s] = result[s].ToString();
}
CloseDBConnection(result, cmd);
return ret;
}
else
{
CloseDBConnection(result, cmd);
return null;
} }
} }