aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/MySQL/MySQLAuthenticationData.cs
diff options
context:
space:
mode:
authorJohn Hurliman2009-11-02 11:19:55 -0800
committerJohn Hurliman2009-11-02 11:19:55 -0800
commit6309fcc5b4b42102b5bb901dbbdf44846f5643f2 (patch)
tree9f71f2801c6ed6eaa40fe637b0cda520a9e5894f /OpenSim/Data/MySQL/MySQLAuthenticationData.cs
parentFix an invalid argument exception in the remote admin module when. (diff)
downloadopensim-SC_OLD-6309fcc5b4b42102b5bb901dbbdf44846f5643f2.zip
opensim-SC_OLD-6309fcc5b4b42102b5bb901dbbdf44846f5643f2.tar.gz
opensim-SC_OLD-6309fcc5b4b42102b5bb901dbbdf44846f5643f2.tar.bz2
opensim-SC_OLD-6309fcc5b4b42102b5bb901dbbdf44846f5643f2.tar.xz
Reverting the memory leak patch for MySQL. Problems have been reported with the grid server after running for several hours
Diffstat (limited to 'OpenSim/Data/MySQL/MySQLAuthenticationData.cs')
-rw-r--r--OpenSim/Data/MySQL/MySQLAuthenticationData.cs18
1 files changed, 11 insertions, 7 deletions
diff --git a/OpenSim/Data/MySQL/MySQLAuthenticationData.cs b/OpenSim/Data/MySQL/MySQLAuthenticationData.cs
index 0780936..e508b52 100644
--- a/OpenSim/Data/MySQL/MySQLAuthenticationData.cs
+++ b/OpenSim/Data/MySQL/MySQLAuthenticationData.cs
@@ -55,7 +55,9 @@ namespace OpenSim.Data.MySQL
55 AuthenticationData ret = new AuthenticationData(); 55 AuthenticationData ret = new AuthenticationData();
56 ret.Data = new Dictionary<string, object>(); 56 ret.Data = new Dictionary<string, object>();
57 57
58 MySqlCommand cmd = new MySqlCommand("select * from `" + m_Realm + "` where UUID = ?principalID"); 58 MySqlCommand cmd = new MySqlCommand(
59 "select * from `"+m_Realm+"` where UUID = ?principalID"
60 );
59 61
60 cmd.Parameters.AddWithValue("?principalID", principalID.ToString()); 62 cmd.Parameters.AddWithValue("?principalID", principalID.ToString());
61 63
@@ -82,14 +84,16 @@ namespace OpenSim.Data.MySQL
82 ret.Data[s] = result[s].ToString(); 84 ret.Data[s] = result[s].ToString();
83 } 85 }
84 86
85 CloseDBConnection(result, cmd); 87 result.Close();
88 CloseReaderCommand(cmd);
89
86 return ret; 90 return ret;
87 } 91 }
88 else 92
89 { 93 result.Close();
90 CloseDBConnection(result, cmd); 94 CloseReaderCommand(cmd);
91 return null; 95
92 } 96 return null;
93 } 97 }
94 98
95 public bool Store(AuthenticationData data) 99 public bool Store(AuthenticationData data)