From da5fd53702ce97d13da2cb50da0753d507e6c11b Mon Sep 17 00:00:00 2001
From: Oren Hurvitz
Date: Mon, 23 Apr 2012 18:39:23 +0300
Subject: 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.

---
 OpenSim/Data/MySQL/MySQLGenericTableHandler.cs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Data/MySQL/MySQLGenericTableHandler.cs')

diff --git a/OpenSim/Data/MySQL/MySQLGenericTableHandler.cs b/OpenSim/Data/MySQL/MySQLGenericTableHandler.cs
index 754cf72..da8e958 100644
--- a/OpenSim/Data/MySQL/MySQLGenericTableHandler.cs
+++ b/OpenSim/Data/MySQL/MySQLGenericTableHandler.cs
@@ -91,15 +91,17 @@ namespace OpenSim.Data.MySQL
             if (m_ColumnNames != null)
                 return;
 
-            m_ColumnNames = new List<string>();
+            List<string> columnNames = new List<string>();
 
             DataTable schemaTable = reader.GetSchemaTable();
             foreach (DataRow row in schemaTable.Rows)
             {
                 if (row["ColumnName"] != null &&
                         (!m_Fields.ContainsKey(row["ColumnName"].ToString())))
-                    m_ColumnNames.Add(row["ColumnName"].ToString());
+                    columnNames.Add(row["ColumnName"].ToString());
             }
+
+            m_ColumnNames = columnNames;
         }
 
         public virtual T[] Get(string field, string key)
-- 
cgit v1.1