From 54eb6fc779c578e28ea4f5a17aebb956838ab14d Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Sat, 6 May 2017 18:25:07 +0100 Subject: [PATCH] GZipStream does have a CopyTo() --- OpenSim/Data/MySQL/MySQLXAssetData.cs | 10 +++++----- OpenSim/Data/PGSQL/PGSQLXAssetData.cs | 18 +++++++++--------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/OpenSim/Data/MySQL/MySQLXAssetData.cs b/OpenSim/Data/MySQL/MySQLXAssetData.cs index 23f6837cfb..e519a94528 100644 --- a/OpenSim/Data/MySQL/MySQLXAssetData.cs +++ b/OpenSim/Data/MySQL/MySQLXAssetData.cs @@ -163,19 +163,19 @@ namespace OpenSim.Data.MySQL if (m_enableCompression) { - using(GZipStream decompressionStream = new GZipStream(new MemoryStream(asset.Data), - CompressionMode.Decompress)) + using(MemoryStream ms = new MemoryStream(asset.Data)) + using(GZipStream decompressionStream = new GZipStream(ms, CompressionMode.Decompress)) { using(MemoryStream outputStream = new MemoryStream()) { - WebUtil.CopyStream(decompressionStream, outputStream, int.MaxValue); + decompressionStream.CopyTo(outputStream, int.MaxValue); // int compressedLength = asset.Data.Length; - asset.Data = outputStream.ToArray(); + asset.Data = outputStream.ToArray(); } // m_log.DebugFormat( // "[XASSET DB]: Decompressed {0} {1} to {2} bytes from {3}", // asset.ID, asset.Name, asset.Data.Length, compressedLength); - } + } } UpdateAccessTime(asset.Metadata, (int)dbReader["AccessTime"]); diff --git a/OpenSim/Data/PGSQL/PGSQLXAssetData.cs b/OpenSim/Data/PGSQL/PGSQLXAssetData.cs index 000a446d1b..1798d20508 100644 --- a/OpenSim/Data/PGSQL/PGSQLXAssetData.cs +++ b/OpenSim/Data/PGSQL/PGSQLXAssetData.cs @@ -173,18 +173,18 @@ namespace OpenSim.Data.PGSQL if (m_enableCompression) { - using (GZipStream decompressionStream = new GZipStream( new MemoryStream(asset.Data), - CompressionMode.Decompress)) + using(MemoryStream ms = new MemoryStream(asset.Data)) + using(GZipStream decompressionStream = new GZipStream(ms, CompressionMode.Decompress)) { using(MemoryStream outputStream = new MemoryStream()) { - WebUtil.CopyStream(decompressionStream,outputStream,int.MaxValue); - // int compressedLength = asset.Data.Length; - asset.Data = outputStream.ToArray(); - } - // m_log.DebugFormat( - // "[XASSET DB]: Decompressed {0} {1} to {2} bytes from {3}", - // asset.ID, asset.Name, asset.Data.Length, compressedLength); + decompressionStream.CopyTo(outputStream,int.MaxValue); + // int compressedLength = asset.Data.Length; + asset.Data = outputStream.ToArray(); + } + // m_log.DebugFormat( + // "[XASSET DB]: Decompressed {0} {1} to {2} bytes from {3}", + // asset.ID, asset.Name, asset.Data.Length, compressedLength); } }