From 4fa0cbdfbb9b8c1b60c8f23edb6301962afd8533 Mon Sep 17 00:00:00 2001
From: Adam Frisby
Date: Thu, 8 May 2008 05:35:01 +0000
Subject: * You can haz more spring cleaning. * Eventually this codebase will
 be clean. >_>

---
 OpenSim/Data/MSSQL/MSSQLManager.cs |  7 +------
 OpenSim/Data/MySQL/MySQLManager.cs | 10 ++--------
 2 files changed, 3 insertions(+), 14 deletions(-)

(limited to 'OpenSim/Data')

diff --git a/OpenSim/Data/MSSQL/MSSQLManager.cs b/OpenSim/Data/MSSQL/MSSQLManager.cs
index 6d73c64..2aea641 100644
--- a/OpenSim/Data/MSSQL/MSSQLManager.cs
+++ b/OpenSim/Data/MSSQL/MSSQLManager.cs
@@ -264,12 +264,7 @@ namespace OpenSim.Data.MSSQL
                 regionprofile.regionUserURI = (string)reader["regionUserURI"];
                 regionprofile.regionUserRecvKey = (string)reader["regionUserRecvKey"];
                 regionprofile.regionUserSendKey = (string)reader["regionUserSendKey"];
-                try
-                {
-                    regionprofile.owner_uuid = new LLUUID((string)reader["owner_uuid"]);
-                }
-                catch(Exception)
-                {}
+                regionprofile.owner_uuid = new LLUUID((string) reader["owner_uuid"]);
                 // World Map Addition
                 string tempRegionMap = reader["regionMapTexture"].ToString();
                 if (tempRegionMap != String.Empty)
diff --git a/OpenSim/Data/MySQL/MySQLManager.cs b/OpenSim/Data/MySQL/MySQLManager.cs
index c62cfa7..1f95aad 100644
--- a/OpenSim/Data/MySQL/MySQLManager.cs
+++ b/OpenSim/Data/MySQL/MySQLManager.cs
@@ -253,13 +253,7 @@ namespace OpenSim.Data.MySQL
                 lock (dbcon)
                 {
                     // Close the DB connection
-                    try
-                    {
-                        dbcon.Close();
-                    }
-                    catch
-                    {
-                    }
+                    dbcon.Close();
 
                     // Try to reopen it
                     try
@@ -269,7 +263,7 @@ namespace OpenSim.Data.MySQL
                     }
                     catch (Exception e)
                     {
-                        m_log.Error("Unable to reconnect to database " + e.ToString());
+                        m_log.Error("Unable to reconnect to database " + e);
                     }
 
                     // Run the query again
-- 
cgit v1.1