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

4 files changed, 77 insertions, 75 deletions

diff --git a/OpenSim/Data/MySQL/MySQLAuthenticationData.cs b/OpenSim/Data/MySQL/MySQLAuthenticationData.cs
index a41f9f8..0780936 100644
--- a/OpenSim/Data/MySQL/MySQLAuthenticationData.cs
+++ b/OpenSim/Data/MySQL/MySQLAuthenticationData.cs
@@ -55,42 +55,40 @@ namespace OpenSim.Data.MySQL
             AuthenticationData ret = new AuthenticationData();
             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;
+
+                if (m_ColumnNames == null)
+                {
+                    m_ColumnNames = new List<string>();
 
-                using (IDataReader result = ExecuteReader(cmd))
+                    DataTable schemaTable = result.GetSchemaTable();
+                    foreach (DataRow row in schemaTable.Rows)
+                        m_ColumnNames.Add(row["ColumnName"].ToString());
+                }
+
+                foreach (string s in m_ColumnNames)
                 {
-                    if (result.Read())
-                    {
-                        ret.PrincipalID = principalID;
-
-                        if (m_ColumnNames == null)
-                        {
-                            m_ColumnNames = new List<string>();
-
-                            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;
-                    }
+                    if (s == "UUID")
+                        continue;
+
+                    ret.Data[s] = result[s].ToString();
                 }
+
+                CloseDBConnection(result, cmd);
+                return ret;
+            }
+            else
+            {
+                CloseDBConnection(result, cmd);
+                return null;
             }
         }
 
diff --git a/OpenSim/Data/MySQL/MySQLFramework.cs b/OpenSim/Data/MySQL/MySQLFramework.cs
index f37e9bc..ccd1ab0 100644
--- a/OpenSim/Data/MySQL/MySQLFramework.cs
+++ b/OpenSim/Data/MySQL/MySQLFramework.cs
@@ -40,7 +40,9 @@ namespace OpenSim.Data.MySQL
     /// </summary>
     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;
 
@@ -81,7 +83,8 @@ 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();
@@ -102,15 +105,18 @@ 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)
+        protected void CloseDBConnection(IDataReader reader, MySqlCommand cmd)
         {
+            reader.Close();
+            cmd.Connection.Close();
             cmd.Connection.Dispose();
         }
     }
diff --git a/OpenSim/Data/MySQL/MySQLRegionData.cs b/OpenSim/Data/MySQL/MySQLRegionData.cs
index 3fe27d5..3b561d1 100644
--- a/OpenSim/Data/MySQL/MySQLRegionData.cs
+++ b/OpenSim/Data/MySQL/MySQLRegionData.cs
@@ -173,7 +173,7 @@ namespace OpenSim.Data.MySQL
                     retList.Add(ret);
                 }
 
-                CloseDBConnection(cmd);
+                CloseDBConnection(result, cmd);
             }
 
             return retList;
diff --git a/OpenSim/Data/MySQL/MySQLUserAccountData.cs b/OpenSim/Data/MySQL/MySQLUserAccountData.cs
index 38a6f55..0bbc3f5 100644
--- a/OpenSim/Data/MySQL/MySQLUserAccountData.cs
+++ b/OpenSim/Data/MySQL/MySQLUserAccountData.cs
@@ -64,48 +64,46 @@ namespace OpenSim.Data.MySQL
             if (scopeID != UUID.Zero)
                 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());
-                cmd.Parameters.AddWithValue("?scopeID", scopeID.ToString());
+                ret.PrincipalID = principalID;
+                UUID scope;
+                UUID.TryParse(result["ScopeID"].ToString(), out scope);
+                ret.ScopeID = scope;
 
-                using (IDataReader result = ExecuteReader(cmd))
+                if (m_ColumnNames == null)
                 {
-                    if (result.Read())
-                    {
-                        ret.PrincipalID = principalID;
-                        UUID scope;
-                        UUID.TryParse(result["ScopeID"].ToString(), out scope);
-                        ret.ScopeID = scope;
-
-                        if (m_ColumnNames == null)
-                        {
-                            m_ColumnNames = new List<string>();
-
-                            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;
-                    }
+                    m_ColumnNames = new List<string>();
+
+                    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(result, cmd);
+                return ret;
+            }
+            else
+            {
+                CloseDBConnection(result, cmd);
+                return null;
             }
         }