* MySQL data tests now pass by fixing a bad fix for a bad cast on the asset Local member in MySQLAssetData

* First pass at applying the using(){} pattern to IDisposable objects. Always use the using pattern on IDisposable objects whenever possible, do not manually call .Close() or .Dispose() unless there is no other way to write the code. This pass mostly covers OpenSim.Data.MySQL, and should have no functional change (tests still pass)

1 files changed, 48 insertions, 54 deletions

diff --git a/OpenSim/Data/MySQL/MySQLAssetData.cs b/OpenSim/Data/MySQL/MySQLAssetData.cs
index 0502b2b..8f97440 100644
--- a/OpenSim/Data/MySQL/MySQLAssetData.cs
+++ b/OpenSim/Data/MySQL/MySQLAssetData.cs
@@ -142,46 +142,45 @@ namespace OpenSim.Data.MySQL
             {
                 _dbConnection.CheckConnection();
 
-                MySqlCommand cmd =
-                    new MySqlCommand(
-                        "SELECT name, description, assetType, local, temporary, data FROM assets WHERE id=?id",
-                        _dbConnection.Connection);
-                cmd.Parameters.AddWithValue("?id", assetID.ToString());
-
-                try
+                using (MySqlCommand cmd = new MySqlCommand(
+                    "SELECT name, description, assetType, local, temporary, data FROM assets WHERE id=?id",
+                    _dbConnection.Connection))
                 {
-                    using (MySqlDataReader dbReader = cmd.ExecuteReader(CommandBehavior.SingleRow))
+                    cmd.Parameters.AddWithValue("?id", assetID.ToString());
+
+                    try
                     {
-                        if (dbReader.Read())
+                        using (MySqlDataReader dbReader = cmd.ExecuteReader(CommandBehavior.SingleRow))
                         {
-                            asset = new AssetBase();
-                            asset.Data = (byte[]) dbReader["data"];
-                            asset.Description = (string) dbReader["description"];
-                            asset.FullID = assetID;
-                            try
-                            {
-                                asset.Local = (bool)dbReader["local"];
-                            }
-                            catch (InvalidCastException)
+                            if (dbReader.Read())
                             {
-                                asset.Local = false;
+                                asset = new AssetBase();
+                                asset.Data = (byte[])dbReader["data"];
+                                asset.Description = (string)dbReader["description"];
+                                asset.FullID = assetID;
+
+                                string local = dbReader["local"].ToString();
+                                if (local.Equals("1") || local.Equals("true", StringComparison.InvariantCultureIgnoreCase))
+                                    asset.Local = true;
+                                else
+                                    asset.Local = false;
+
+                                asset.Name = (string)dbReader["name"];
+                                asset.Type = (sbyte)dbReader["assetType"];
+                                asset.Temporary = Convert.ToBoolean(dbReader["temporary"]);
                             }
-                            asset.Name = (string) dbReader["name"];
-                            asset.Type = (sbyte) dbReader["assetType"];
-                            asset.Temporary = Convert.ToBoolean(dbReader["temporary"]);
                         }
-                        dbReader.Close();
-                        cmd.Dispose();
+
+                        if (asset != null)
+                            UpdateAccessTime(asset);
+                    }
+                    catch (Exception e)
+                    {
+                        m_log.ErrorFormat(
+                            "[ASSETS DB]: MySql failure fetching asset {0}" + Environment.NewLine + e.ToString()
+                            + Environment.NewLine + "Reconnecting", assetID);
+                        _dbConnection.Reconnect();
                     }
-                    if (asset != null)
-                        UpdateAccessTime(asset);
-                }
-                catch (Exception e)
-                {
-                    m_log.ErrorFormat(
-                        "[ASSETS DB]: MySql failure fetching asset {0}" + Environment.NewLine + e.ToString()
-                        + Environment.NewLine + "Reconnecting", assetID);
-                    _dbConnection.Reconnect();
                 }
             }
             return asset;
@@ -297,32 +296,27 @@ namespace OpenSim.Data.MySQL
             {
                 _dbConnection.CheckConnection();
 
-                MySqlCommand cmd =
-                    new MySqlCommand(
-                        "SELECT id FROM assets WHERE id=?id",
-                        _dbConnection.Connection);
-
-                cmd.Parameters.AddWithValue("?id", uuid.ToString());
-
-                try
+                using (MySqlCommand cmd = new MySqlCommand(
+                    "SELECT id FROM assets WHERE id=?id",
+                    _dbConnection.Connection))
                 {
-                    using (MySqlDataReader dbReader = cmd.ExecuteReader(CommandBehavior.SingleRow))
+                    cmd.Parameters.AddWithValue("?id", uuid.ToString());
+
+                    try
                     {
-                        if (dbReader.Read())
+                        using (MySqlDataReader dbReader = cmd.ExecuteReader(CommandBehavior.SingleRow))
                         {
-                            assetExists = true;
+                            if (dbReader.Read())
+                                assetExists = true;
                         }
-
-                        dbReader.Close();
-                        cmd.Dispose();
                     }
-                }
-                catch (Exception e)
-                {
-                    m_log.ErrorFormat(
-                        "[ASSETS DB]: MySql failure fetching asset {0}" + Environment.NewLine + e.ToString()
-                        + Environment.NewLine + "Attempting reconnection", uuid);
-                    _dbConnection.Reconnect();
+                    catch (Exception e)
+                    {
+                        m_log.ErrorFormat(
+                            "[ASSETS DB]: MySql failure fetching asset {0}" + Environment.NewLine + e.ToString()
+                            + Environment.NewLine + "Attempting reconnection", uuid);
+                        _dbConnection.Reconnect();
+                    }
                 }
             }