aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/MySQL/MySQLFramework.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Data/MySQL/MySQLFramework.cs')
-rw-r--r--OpenSim/Data/MySQL/MySQLFramework.cs11
1 files changed, 3 insertions, 8 deletions
diff --git a/OpenSim/Data/MySQL/MySQLFramework.cs b/OpenSim/Data/MySQL/MySQLFramework.cs
index ccd1ab0..fca0ca5 100644
--- a/OpenSim/Data/MySQL/MySQLFramework.cs
+++ b/OpenSim/Data/MySQL/MySQLFramework.cs
@@ -40,10 +40,6 @@ namespace OpenSim.Data.MySQL
40 /// </summary> 40 /// </summary>
41 public class MySqlFramework 41 public class MySqlFramework
42 { 42 {
43 private static readonly log4net.ILog m_log =
44 log4net.LogManager.GetLogger(
45 System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
46
47 protected MySqlConnection m_Connection; 43 protected MySqlConnection m_Connection;
48 44
49 protected MySqlFramework(string connectionString) 45 protected MySqlFramework(string connectionString)
@@ -73,11 +69,11 @@ namespace OpenSim.Data.MySQL
73 } 69 }
74 catch (MySqlException e) 70 catch (MySqlException e)
75 { 71 {
76 m_log.Error(e.Message, e);
77 if (errorSeen) 72 if (errorSeen)
78 throw; 73 throw;
79 74
80 // This is "Server has gone away" and "Server lost" 75 // This is "Server has gone away" and "Server lost"
76 //
81 if (e.Number == 2006 || e.Number == 2013) 77 if (e.Number == 2006 || e.Number == 2013)
82 { 78 {
83 errorSeen = true; 79 errorSeen = true;
@@ -96,7 +92,6 @@ namespace OpenSim.Data.MySQL
96 } 92 }
97 catch (Exception e) 93 catch (Exception e)
98 { 94 {
99 m_log.Error(e.Message, e);
100 return 0; 95 return 0;
101 } 96 }
102 } 97 }
@@ -113,11 +108,11 @@ namespace OpenSim.Data.MySQL
113 return cmd.ExecuteReader(); 108 return cmd.ExecuteReader();
114 } 109 }
115 110
116 protected void CloseDBConnection(IDataReader reader, MySqlCommand cmd) 111 protected void CloseReaderCommand(MySqlCommand cmd)
117 { 112 {
118 reader.Close();
119 cmd.Connection.Close(); 113 cmd.Connection.Close();
120 cmd.Connection.Dispose(); 114 cmd.Connection.Dispose();
115 cmd.Dispose();
121 } 116 }
122 } 117 }
123} 118}