ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-06-29 10:35:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed problem with MySQL: it was possible for one thread to use an incomplete list of column names if another thread was creating the list at the same time. Now this is thread-safe.

Browse Source
This commit is contained in:
Oren Hurvitz
2012-04-23 18:39:23 +03:00
committed by Justin Clark-Casey (justincc)
parent c70e85a327
commit da5fd53702
3 changed files with 37 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -162,17 +162,7 @@ namespace OpenSim.Data.MySQL
ret.sizeX = Convert.ToInt32(result["sizeX"]);
ret.sizeY = Convert.ToInt32(result["sizeY"]);
if (m_ColumnNames == null)
{
m_ColumnNames = new List<string>();
DataTable schemaTable = result.GetSchemaTable();
foreach (DataRow row in schemaTable.Rows)
{
if (row["ColumnName"] != null)
m_ColumnNames.Add(row["ColumnName"].ToString());
}
}
CheckColumnNames(result);
foreach (string s in m_ColumnNames)
{
@@ -202,6 +192,23 @@ namespace OpenSim.Data.MySQL
return retList;
}
private void CheckColumnNames(IDataReader result)
{
if (m_ColumnNames != null)
return;
List<string> columnNames = new List<string>();
DataTable schemaTable = result.GetSchemaTable();
foreach (DataRow row in schemaTable.Rows)
{
if (row["ColumnName"] != null)
columnNames.Add(row["ColumnName"].ToString());
}
m_ColumnNames = columnNames;
}
public bool Store(RegionData data)
{
if (data.Data.ContainsKey("uuid"))