diff options
author | John Hurliman | 2009-11-02 11:19:55 -0800 |
---|---|---|
committer | John Hurliman | 2009-11-02 11:19:55 -0800 |
commit | 6309fcc5b4b42102b5bb901dbbdf44846f5643f2 (patch) | |
tree | 9f71f2801c6ed6eaa40fe637b0cda520a9e5894f /OpenSim/Data/MSSQL/AutoClosingSqlCommand.cs | |
parent | Fix an invalid argument exception in the remote admin module when. (diff) | |
download | opensim-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/MSSQL/AutoClosingSqlCommand.cs')
-rw-r--r-- | OpenSim/Data/MSSQL/AutoClosingSqlCommand.cs | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/OpenSim/Data/MSSQL/AutoClosingSqlCommand.cs b/OpenSim/Data/MSSQL/AutoClosingSqlCommand.cs index 0e21880..93e48cd 100644 --- a/OpenSim/Data/MSSQL/AutoClosingSqlCommand.cs +++ b/OpenSim/Data/MSSQL/AutoClosingSqlCommand.cs | |||
@@ -197,11 +197,20 @@ namespace OpenSim.Data.MSSQL | |||
197 | public void Dispose() | 197 | public void Dispose() |
198 | { | 198 | { |
199 | SqlConnection conn = realCommand.Connection; | 199 | SqlConnection conn = realCommand.Connection; |
200 | try { realCommand.Dispose(); } | 200 | try |
201 | { | ||
202 | realCommand.Dispose(); | ||
203 | } | ||
201 | finally | 204 | finally |
202 | { | 205 | { |
203 | try { conn.Dispose(); } | 206 | try |
204 | finally { } | 207 | { |
208 | conn.Close(); | ||
209 | } | ||
210 | finally | ||
211 | { | ||
212 | conn.Dispose(); | ||
213 | } | ||
205 | } | 214 | } |
206 | } | 215 | } |
207 | 216 | ||