aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/MySQL
diff options
context:
space:
mode:
authorUbitUmarov2017-05-06 17:47:43 +0100
committerUbitUmarov2017-05-06 17:47:43 +0100
commiteb93855d84414be6c9e927c0da3be56ae6831573 (patch)
treee2fdd8d067efef8ecccc7118549fa55082e0b2ec /OpenSim/Data/MySQL
parent dispose some MemoryStreams (diff)
downloadopensim-SC_OLD-eb93855d84414be6c9e927c0da3be56ae6831573.zip
opensim-SC_OLD-eb93855d84414be6c9e927c0da3be56ae6831573.tar.gz
opensim-SC_OLD-eb93855d84414be6c9e927c0da3be56ae6831573.tar.bz2
opensim-SC_OLD-eb93855d84414be6c9e927c0da3be56ae6831573.tar.xz
dispose some MemoryStreams
Diffstat (limited to 'OpenSim/Data/MySQL')
-rw-r--r--OpenSim/Data/MySQL/MySQLXAssetData.cs14
1 files changed, 8 insertions, 6 deletions
diff --git a/OpenSim/Data/MySQL/MySQLXAssetData.cs b/OpenSim/Data/MySQL/MySQLXAssetData.cs
index 2ef7f8f..23f6837 100644
--- a/OpenSim/Data/MySQL/MySQLXAssetData.cs
+++ b/OpenSim/Data/MySQL/MySQLXAssetData.cs
@@ -163,13 +163,15 @@ namespace OpenSim.Data.MySQL
163 163
164 if (m_enableCompression) 164 if (m_enableCompression)
165 { 165 {
166 using (GZipStream decompressionStream = new GZipStream(new MemoryStream(asset.Data), CompressionMode.Decompress)) 166 using(GZipStream decompressionStream = new GZipStream(new MemoryStream(asset.Data),
167 CompressionMode.Decompress))
167 { 168 {
168 MemoryStream outputStream = new MemoryStream(); 169 using(MemoryStream outputStream = new MemoryStream())
169 WebUtil.CopyStream(decompressionStream, outputStream, int.MaxValue); 170 {
170// int compressedLength = asset.Data.Length; 171 WebUtil.CopyStream(decompressionStream, outputStream, int.MaxValue);
171 asset.Data = outputStream.ToArray(); 172// int compressedLength = asset.Data.Length;
172 173 asset.Data = outputStream.ToArray();
174 }
173// m_log.DebugFormat( 175// m_log.DebugFormat(
174// "[XASSET DB]: Decompressed {0} {1} to {2} bytes from {3}", 176// "[XASSET DB]: Decompressed {0} {1} to {2} bytes from {3}",
175// asset.ID, asset.Name, asset.Data.Length, compressedLength); 177// asset.ID, asset.Name, asset.Data.Length, compressedLength);