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

Added CloseDBConnection() to replace the old CloseReaderCommand(). This will close the MySQLConnection attached to a MySQLCommand. I'm not sure if this accounts for every time a database connection needs to be closed, but it matches up 1:1 with the places where the database connection was previously being closed

prioritization
John Hurliman 2009-10-05 16:39:40 -07:00
parent d4a6d9191a
commit 6720369376
4 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -82,12 +82,16 @@ namespace OpenSim.Data.MySQL
ret.Data[s] = result[s].ToString();
}
CloseDBConnection(cmd);
return ret;
}
else
{
CloseDBConnection(cmd);
return null;
}
}
}
return null;
}
public bool Store(AuthenticationData data)

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

@ -47,7 +47,6 @@ namespace OpenSim.Data.MySQL
protected MySqlFramework(string connectionString)
{
m_Connection = new MySqlConnection(connectionString);
m_Connection.Open();
}
@ -82,8 +81,7 @@ namespace OpenSim.Data.MySQL
errorSeen = true;
m_Connection.Close();
MySqlConnection newConnection = (MySqlConnection)
((ICloneable)m_Connection).Clone();
MySqlConnection newConnection = (MySqlConnection)((ICloneable)m_Connection).Clone();
m_Connection.Dispose();
m_Connection = newConnection;
m_Connection.Open();
@ -104,14 +102,16 @@ namespace OpenSim.Data.MySQL
protected IDataReader ExecuteReader(MySqlCommand cmd)
{
MySqlConnection newConnection = (MySqlConnection)
((ICloneable)m_Connection).Clone();
MySqlConnection newConnection = (MySqlConnection)((ICloneable)m_Connection).Clone();
newConnection.Open();
cmd.Connection = newConnection;
return cmd.ExecuteReader();
}
protected void CloseDBConnection(MySqlCommand cmd)
{
cmd.Connection.Dispose();
}
}
}

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

@ -172,6 +172,8 @@ namespace OpenSim.Data.MySQL
retList.Add(ret);
}
CloseDBConnection(cmd);
}
return retList;

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

@ -97,12 +97,16 @@ namespace OpenSim.Data.MySQL
ret.Data[s] = result[s].ToString();
}
CloseDBConnection(cmd);
return ret;
}
else
{
CloseDBConnection(cmd);
return null;
}
}
}
return null;
}
public bool Store(UserAccountData data)