From 522eff61383e9a8acfdf34289cd64a8fdc27bb19 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Mon, 30 Apr 2012 15:54:35 +0100
Subject: Consistently use using() to make sure we dispose of used
 MySqlCommands where this is not already being done.

---
 OpenSim/Data/MySQL/MySQLPresenceData.cs | 36 +++++++++++++++++----------------
 1 file changed, 19 insertions(+), 17 deletions(-)

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

diff --git a/OpenSim/Data/MySQL/MySQLPresenceData.cs b/OpenSim/Data/MySQL/MySQLPresenceData.cs
index fc625f0..7808060 100644
--- a/OpenSim/Data/MySQL/MySQLPresenceData.cs
+++ b/OpenSim/Data/MySQL/MySQLPresenceData.cs
@@ -63,13 +63,14 @@ namespace OpenSim.Data.MySQL
 
         public void LogoutRegionAgents(UUID regionID)
         {
-            MySqlCommand cmd = new MySqlCommand();
-
-            cmd.CommandText = String.Format("delete from {0} where `RegionID`=?RegionID", m_Realm);
-
-            cmd.Parameters.AddWithValue("?RegionID", regionID.ToString());
-
-            ExecuteNonQuery(cmd);
+            using (MySqlCommand cmd = new MySqlCommand())
+            {
+                cmd.CommandText = String.Format("delete from {0} where `RegionID`=?RegionID", m_Realm);
+    
+                cmd.Parameters.AddWithValue("?RegionID", regionID.ToString());
+    
+                ExecuteNonQuery(cmd);
+            }
         }
 
         public bool ReportAgent(UUID sessionID, UUID regionID)
@@ -81,17 +82,18 @@ namespace OpenSim.Data.MySQL
             if (regionID == UUID.Zero)
                 return false;
 
-            MySqlCommand cmd = new MySqlCommand();
-
-            cmd.CommandText = String.Format("update {0} set RegionID=?RegionID, LastSeen=NOW() where `SessionID`=?SessionID", m_Realm);
-
-            cmd.Parameters.AddWithValue("?SessionID", sessionID.ToString());
-            cmd.Parameters.AddWithValue("?RegionID", regionID.ToString());
-
-            if (ExecuteNonQuery(cmd) == 0)
-                return false;
+            using (MySqlCommand cmd = new MySqlCommand())
+            {
+                cmd.CommandText = String.Format("update {0} set RegionID=?RegionID, LastSeen=NOW() where `SessionID`=?SessionID", m_Realm);
+    
+                cmd.Parameters.AddWithValue("?SessionID", sessionID.ToString());
+                cmd.Parameters.AddWithValue("?RegionID", regionID.ToString());
+    
+                if (ExecuteNonQuery(cmd) == 0)
+                    return false;
+            }
 
             return true;
         }
     }
-}
+}
\ No newline at end of file
-- 
cgit v1.1