From 672036937671a69426a12936c69efcb54d029e86 Mon Sep 17 00:00:00 2001
From: John Hurliman
Date: Mon, 5 Oct 2009 16:39:40 -0700
Subject: 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

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

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

diff --git a/OpenSim/Data/MySQL/MySQLUserAccountData.cs b/OpenSim/Data/MySQL/MySQLUserAccountData.cs
index c713a11..38a6f55 100644
--- a/OpenSim/Data/MySQL/MySQLUserAccountData.cs
+++ b/OpenSim/Data/MySQL/MySQLUserAccountData.cs
@@ -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)
-- 
cgit v1.1


From 8a7a947faaeeaeac2f74f695cefd6eb3e774dc15 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Tue, 6 Oct 2009 14:30:25 +0100
Subject: 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

---
 OpenSim/Data/MySQL/MySQLUserAccountData.cs | 74 +++++++++++++++---------------
 1 file changed, 36 insertions(+), 38 deletions(-)

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

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;
             }
         }
 
-- 
cgit v1.1