aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorUbitUmarov2017-05-06 18:25:07 +0100
committerUbitUmarov2017-05-06 18:25:07 +0100
commit54eb6fc779c578e28ea4f5a17aebb956838ab14d (patch)
tree221a368b621677bdac45e5b97553fd5039eda783
parent dispose some MemoryStreams (diff)
downloadopensim-SC_OLD-54eb6fc779c578e28ea4f5a17aebb956838ab14d.zip
opensim-SC_OLD-54eb6fc779c578e28ea4f5a17aebb956838ab14d.tar.gz
opensim-SC_OLD-54eb6fc779c578e28ea4f5a17aebb956838ab14d.tar.bz2
opensim-SC_OLD-54eb6fc779c578e28ea4f5a17aebb956838ab14d.tar.xz
GZipStream does have a CopyTo()
-rw-r--r--OpenSim/Data/MySQL/MySQLXAssetData.cs10
-rw-r--r--OpenSim/Data/PGSQL/PGSQLXAssetData.cs18
2 files changed, 14 insertions, 14 deletions
diff --git a/OpenSim/Data/MySQL/MySQLXAssetData.cs b/OpenSim/Data/MySQL/MySQLXAssetData.cs
index 23f6837..e519a94 100644
--- a/OpenSim/Data/MySQL/MySQLXAssetData.cs
+++ b/OpenSim/Data/MySQL/MySQLXAssetData.cs
@@ -163,19 +163,19 @@ 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), 166 using(MemoryStream ms = new MemoryStream(asset.Data))
167 CompressionMode.Decompress)) 167 using(GZipStream decompressionStream = new GZipStream(ms, CompressionMode.Decompress))
168 { 168 {
169 using(MemoryStream outputStream = new MemoryStream()) 169 using(MemoryStream outputStream = new MemoryStream())
170 { 170 {
171 WebUtil.CopyStream(decompressionStream, outputStream, int.MaxValue); 171 decompressionStream.CopyTo(outputStream, int.MaxValue);
172// int compressedLength = asset.Data.Length; 172// int compressedLength = asset.Data.Length;
173 asset.Data = outputStream.ToArray(); 173 asset.Data = outputStream.ToArray();
174 } 174 }
175// m_log.DebugFormat( 175// m_log.DebugFormat(
176// "[XASSET DB]: Decompressed {0} {1} to {2} bytes from {3}", 176// "[XASSET DB]: Decompressed {0} {1} to {2} bytes from {3}",
177// asset.ID, asset.Name, asset.Data.Length, compressedLength); 177// asset.ID, asset.Name, asset.Data.Length, compressedLength);
178 } 178 }
179 } 179 }
180 180
181 UpdateAccessTime(asset.Metadata, (int)dbReader["AccessTime"]); 181 UpdateAccessTime(asset.Metadata, (int)dbReader["AccessTime"]);
diff --git a/OpenSim/Data/PGSQL/PGSQLXAssetData.cs b/OpenSim/Data/PGSQL/PGSQLXAssetData.cs
index 000a446..1798d20 100644
--- a/OpenSim/Data/PGSQL/PGSQLXAssetData.cs
+++ b/OpenSim/Data/PGSQL/PGSQLXAssetData.cs
@@ -173,18 +173,18 @@ namespace OpenSim.Data.PGSQL
173 173
174 if (m_enableCompression) 174 if (m_enableCompression)
175 { 175 {
176 using (GZipStream decompressionStream = new GZipStream( new MemoryStream(asset.Data), 176 using(MemoryStream ms = new MemoryStream(asset.Data))
177 CompressionMode.Decompress)) 177 using(GZipStream decompressionStream = new GZipStream(ms, CompressionMode.Decompress))
178 { 178 {
179 using(MemoryStream outputStream = new MemoryStream()) 179 using(MemoryStream outputStream = new MemoryStream())
180 { 180 {
181 WebUtil.CopyStream(decompressionStream,outputStream,int.MaxValue); 181 decompressionStream.CopyTo(outputStream,int.MaxValue);
182 // int compressedLength = asset.Data.Length; 182 // int compressedLength = asset.Data.Length;
183 asset.Data = outputStream.ToArray(); 183 asset.Data = outputStream.ToArray();
184 } 184 }
185 // m_log.DebugFormat( 185 // m_log.DebugFormat(
186 // "[XASSET DB]: Decompressed {0} {1} to {2} bytes from {3}", 186 // "[XASSET DB]: Decompressed {0} {1} to {2} bytes from {3}",
187 // asset.ID, asset.Name, asset.Data.Length, compressedLength); 187 // asset.ID, asset.Name, asset.Data.Length, compressedLength);
188 } 188 }
189 } 189 }
190 190