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.cs29
1 files changed, 14 insertions, 15 deletions
diff --git a/OpenSim/Data/MySQL/MySQLFramework.cs b/OpenSim/Data/MySQL/MySQLFramework.cs
index a522912..34791cf 100644
--- a/OpenSim/Data/MySQL/MySQLFramework.cs
+++ b/OpenSim/Data/MySQL/MySQLFramework.cs
@@ -60,32 +60,31 @@ namespace OpenSim.Data.MySQL
60 protected int ExecuteNonQuery(MySqlCommand cmd) 60 protected int ExecuteNonQuery(MySqlCommand cmd)
61 { 61 {
62 lock (m_dbLock) 62 lock (m_dbLock)
63 using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
64 { 63 {
65 dbcon.Open(); 64 using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
66 cmd.Connection = dbcon;
67
68 try
69 { 65 {
70 dbcon.Open();
71 cmd.Connection = dbcon;
72
73 try 66 try
74 { 67 {
75 return cmd.ExecuteNonQuery(); 68 dbcon.Open();
69 cmd.Connection = dbcon;
70
71 try
72 {
73 return cmd.ExecuteNonQuery();
74 }
75 catch (Exception e)
76 {
77 m_log.Error(e.Message, e);
78 m_log.Error(Environment.StackTrace.ToString());
79 return 0;
80 }
76 } 81 }
77 catch (Exception e) 82 catch (Exception e)
78 { 83 {
79 m_log.Error(e.Message, e); 84 m_log.Error(e.Message, e);
80 m_log.Error(Environment.StackTrace.ToString());
81 return 0; 85 return 0;
82 } 86 }
83 } 87 }
84 catch (Exception e)
85 {
86 m_log.Error(e.Message, e);
87 return 0;
88 }
89 } 88 }
90 } 89 }
91 } 90 }