From 92be01d5e60c00568a4b8efc4bfa17f8b3df8a63 Mon Sep 17 00:00:00 2001
From: root <root@grid00002.t-data.com>
Date: Sat, 26 Dec 2009 03:24:46 +0100
Subject: [PATCH] Make the GenericTableHandler work as intended

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

diff --git a/OpenSim/Data/MySQL/MySQLGenericTableHandler.cs b/OpenSim/Data/MySQL/MySQLGenericTableHandler.cs
index 9b8a001675..4dfc32403a 100644
--- a/OpenSim/Data/MySQL/MySQLGenericTableHandler.cs
+++ b/OpenSim/Data/MySQL/MySQLGenericTableHandler.cs
@@ -37,7 +37,7 @@ using OpenSim.Region.Framework.Interfaces;
 
 namespace OpenSim.Data.MySQL
 {
-    public class MySQLGenericTableHandler<T> : MySqlFramework where T: struct
+    public class MySQLGenericTableHandler<T> : MySqlFramework where T: class, new()
     {
         private static readonly ILog m_log =
             LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
@@ -63,7 +63,7 @@ namespace OpenSim.Data.MySQL
             }
 
             Type t = typeof(T);
-            FieldInfo[] fields = t.GetFields(BindingFlags.NonPublic |
+            FieldInfo[] fields = t.GetFields(BindingFlags.Public |
                                              BindingFlags.Instance |
                                              BindingFlags.DeclaredOnly);
 
@@ -165,7 +165,11 @@ namespace OpenSim.Data.MySQL
                             new Dictionary<string, string>();
 
                     foreach (string col in m_ColumnNames)
+                    {
                         data[col] = reader[col].ToString();
+                        if (data[col] == null)
+                            data[col] = String.Empty;
+                    }
 
                     m_DataField.SetValue(row, data);
                 }
@@ -218,6 +222,8 @@ namespace OpenSim.Data.MySQL
 
             query = String.Format("replace into {0} (`", m_Realm) + String.Join("`,`", names.ToArray()) + "`) values ('" + String.Join("','", values.ToArray()) + "')";
 
+            cmd.CommandText = query;
+
             if (ExecuteNonQuery(cmd) > 0)
                 return true;