workaround potencial memory leaks

3 files changed, 66 insertions, 61 deletions

diff --git a/OpenSim/Data/MySQL/MySQLFSAssetData.cs b/OpenSim/Data/MySQL/MySQLFSAssetData.cs
index 2fb81ae..ce40c03 100644
--- a/OpenSim/Data/MySQL/MySQLFSAssetData.cs
+++ b/OpenSim/Data/MySQL/MySQLFSAssetData.cs
@@ -316,15 +316,16 @@ namespace OpenSim.Data.MySQL
                     return 0;
                 }
 
-                MySqlCommand cmd = conn.CreateCommand();
-
-                cmd.CommandText = String.Format("select count(*) as count from {0}", m_Table);
-
-                using (IDataReader reader = cmd.ExecuteReader())
+                using(MySqlCommand cmd = conn.CreateCommand())
                 {
-                    reader.Read();
+                    cmd.CommandText = String.Format("select count(*) as count from {0}",m_Table);
+
+                    using (IDataReader reader = cmd.ExecuteReader())
+                    {
+                        reader.Read();
 
-                    count = Convert.ToInt32(reader["count"]);
+                        count = Convert.ToInt32(reader["count"]);
+                    }
                 }
             }
 
@@ -333,15 +334,15 @@ namespace OpenSim.Data.MySQL
 
         public bool Delete(string id)
         {
-            MySqlCommand cmd = new MySqlCommand();
-
-            cmd.CommandText = String.Format("delete from {0} where id = ?id", m_Table);
+            using(MySqlCommand cmd = new MySqlCommand())
+            {
 
-            cmd.Parameters.AddWithValue("?id", id);
+                cmd.CommandText = String.Format("delete from {0} where id = ?id",m_Table);
 
-            ExecuteNonQuery(cmd);
+                cmd.Parameters.AddWithValue("?id", id);
 
-            cmd.Dispose();
+                ExecuteNonQuery(cmd);
+            }
 
             return true;
         }
diff --git a/OpenSim/Data/MySQL/MySQLXAssetData.cs b/OpenSim/Data/MySQL/MySQLXAssetData.cs
index 68e1a5a..ec2bcc6 100644
--- a/OpenSim/Data/MySQL/MySQLXAssetData.cs
+++ b/OpenSim/Data/MySQL/MySQLXAssetData.cs
@@ -440,37 +440,39 @@ namespace OpenSim.Data.MySQL
             using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
             {
                 dbcon.Open();
-                MySqlCommand cmd = new MySqlCommand("SELECT Name, Description, AccessTime, AssetType, Temporary, ID, AssetFlags, CreatorID FROM XAssetsMeta LIMIT ?start, ?count", dbcon);
-                cmd.Parameters.AddWithValue("?start", start);
-                cmd.Parameters.AddWithValue("?count", count);
-
-                try
+                using(MySqlCommand cmd = new MySqlCommand("SELECT Name, Description, AccessTime, AssetType, Temporary, ID, AssetFlags, CreatorID FROM XAssetsMeta LIMIT ?start, ?count",dbcon))
                 {
-                    using (MySqlDataReader dbReader = cmd.ExecuteReader())
+                    cmd.Parameters.AddWithValue("?start",start);
+                    cmd.Parameters.AddWithValue("?count", count);
+
+                    try
                     {
-                        while (dbReader.Read())
+                        using (MySqlDataReader dbReader = cmd.ExecuteReader())
                         {
-                            AssetMetadata metadata = new AssetMetadata();
-                            metadata.Name = (string)dbReader["Name"];
-                            metadata.Description = (string)dbReader["Description"];
-                            metadata.Type = (sbyte)dbReader["AssetType"];
-                            metadata.Temporary = Convert.ToBoolean(dbReader["Temporary"]); // Not sure if this is correct.
-                            metadata.Flags = (AssetFlags)Convert.ToInt32(dbReader["AssetFlags"]);
-                            metadata.FullID = DBGuid.FromDB(dbReader["ID"]);
-                            metadata.CreatorID = dbReader["CreatorID"].ToString();
+                            while (dbReader.Read())
+                            {
+                                AssetMetadata metadata = new AssetMetadata();
+                                metadata.Name = (string)dbReader["Name"];
+                                metadata.Description = (string)dbReader["Description"];
+                                metadata.Type = (sbyte)dbReader["AssetType"];
+                                metadata.Temporary = Convert.ToBoolean(dbReader["Temporary"]); // Not sure if this is correct.
+                                metadata.Flags = (AssetFlags)Convert.ToInt32(dbReader["AssetFlags"]);
+                                metadata.FullID = DBGuid.FromDB(dbReader["ID"]);
+                                metadata.CreatorID = dbReader["CreatorID"].ToString();
 
-                            // We'll ignore this for now - it appears unused!
-//                                metadata.SHA1 = dbReader["hash"]);
+                                // We'll ignore this for now - it appears unused!
+    //                                metadata.SHA1 = dbReader["hash"]);
 
-                            UpdateAccessTime(metadata, (int)dbReader["AccessTime"]);
+                                UpdateAccessTime(metadata, (int)dbReader["AccessTime"]);
 
-                            retList.Add(metadata);
+                                retList.Add(metadata);
+                            }
                         }
                     }
-                }
-                catch (Exception e)
-                {
-                    m_log.Error("[XASSETS DB]: MySql failure fetching asset set" + Environment.NewLine + e.ToString());
+                    catch (Exception e)
+                    {
+                        m_log.Error("[XASSETS DB]: MySql failure fetching asset set" + Environment.NewLine + e.ToString());
+                    }
                 }
             }
 
diff --git a/OpenSim/Data/PGSQL/PGSQLXAssetData.cs b/OpenSim/Data/PGSQL/PGSQLXAssetData.cs
index 4f682f0..d3518cf 100644
--- a/OpenSim/Data/PGSQL/PGSQLXAssetData.cs
+++ b/OpenSim/Data/PGSQL/PGSQLXAssetData.cs
@@ -518,40 +518,42 @@ namespace OpenSim.Data.PGSQL
                 using (NpgsqlConnection dbcon = new NpgsqlConnection(m_connectionString))
                 {
                     dbcon.Open();
-                    NpgsqlCommand cmd = new NpgsqlCommand( @"SELECT name, description, access_time, ""AssetType"", temporary, id, asset_flags, creatorid
+                    using(NpgsqlCommand cmd = new NpgsqlCommand(@"SELECT name, description, access_time, ""AssetType"", temporary, id, asset_flags, creatorid
                                             FROM XAssetsMeta 
-                                            LIMIT :start, :count", dbcon);
-                    cmd.Parameters.Add(m_database.CreateParameter("start", start));
-                    cmd.Parameters.Add(m_database.CreateParameter("count", count));
-
-                    try
+                                            LIMIT :start, :count",dbcon))
                     {
-                        using (NpgsqlDataReader dbReader = cmd.ExecuteReader())
+                        cmd.Parameters.Add(m_database.CreateParameter("start",start));
+                        cmd.Parameters.Add(m_database.CreateParameter("count", count));
+
+                        try
                         {
-                            while (dbReader.Read())
+                            using (NpgsqlDataReader dbReader = cmd.ExecuteReader())
                             {
-                                AssetMetadata metadata = new AssetMetadata();
-                                metadata.Name = (string)dbReader["name"];
-                                metadata.Description = (string)dbReader["description"];
-                                metadata.Type = Convert.ToSByte(dbReader["AssetType"]);
-                                metadata.Temporary = Convert.ToBoolean(dbReader["temporary"]);
-                                metadata.Flags = (AssetFlags)Convert.ToInt32(dbReader["asset_flags"]);
-                                metadata.FullID = DBGuid.FromDB(dbReader["id"]);
-                                metadata.CreatorID = dbReader["creatorid"].ToString();
+                                while (dbReader.Read())
+                                {
+                                    AssetMetadata metadata = new AssetMetadata();
+                                    metadata.Name = (string)dbReader["name"];
+                                    metadata.Description = (string)dbReader["description"];
+                                    metadata.Type = Convert.ToSByte(dbReader["AssetType"]);
+                                    metadata.Temporary = Convert.ToBoolean(dbReader["temporary"]);
+                                    metadata.Flags = (AssetFlags)Convert.ToInt32(dbReader["asset_flags"]);
+                                    metadata.FullID = DBGuid.FromDB(dbReader["id"]);
+                                    metadata.CreatorID = dbReader["creatorid"].ToString();
 
-                                // We'll ignore this for now - it appears unused!
-//                                metadata.SHA1 = dbReader["hash"]);
+                                    // We'll ignore this for now - it appears unused!
+    //                                metadata.SHA1 = dbReader["hash"]);
 
-                                UpdateAccessTime(metadata, (int)dbReader["access_time"]);
+                                    UpdateAccessTime(metadata, (int)dbReader["access_time"]);
 
-                                retList.Add(metadata);
+                                    retList.Add(metadata);
+                                }
                             }
                         }
-                    }
-                    catch (Exception e)
-                    {
-                        m_log.Error("[XASSETS DB]: PGSql failure fetching asset set" + Environment.NewLine + e.ToString());
-                    }
+                        catch (Exception e)
+                        {
+                            m_log.Error("[XASSETS DB]: PGSql failure fetching asset set" + Environment.NewLine + e.ToString());
+                        }
+                   }
                 }
             }