GZipStream does have a CopyTo()
parent
eb93855d84
commit
54eb6fc779
|
@ -163,12 +163,12 @@ namespace OpenSim.Data.MySQL
|
||||||
|
|
||||||
if (m_enableCompression)
|
if (m_enableCompression)
|
||||||
{
|
{
|
||||||
using(GZipStream decompressionStream = new GZipStream(new MemoryStream(asset.Data),
|
using(MemoryStream ms = new MemoryStream(asset.Data))
|
||||||
CompressionMode.Decompress))
|
using(GZipStream decompressionStream = new GZipStream(ms, CompressionMode.Decompress))
|
||||||
{
|
{
|
||||||
using(MemoryStream outputStream = new MemoryStream())
|
using(MemoryStream outputStream = new MemoryStream())
|
||||||
{
|
{
|
||||||
WebUtil.CopyStream(decompressionStream, outputStream, int.MaxValue);
|
decompressionStream.CopyTo(outputStream, int.MaxValue);
|
||||||
// int compressedLength = asset.Data.Length;
|
// int compressedLength = asset.Data.Length;
|
||||||
asset.Data = outputStream.ToArray();
|
asset.Data = outputStream.ToArray();
|
||||||
}
|
}
|
||||||
|
|
|
@ -173,12 +173,12 @@ namespace OpenSim.Data.PGSQL
|
||||||
|
|
||||||
if (m_enableCompression)
|
if (m_enableCompression)
|
||||||
{
|
{
|
||||||
using (GZipStream decompressionStream = new GZipStream( new MemoryStream(asset.Data),
|
using(MemoryStream ms = new MemoryStream(asset.Data))
|
||||||
CompressionMode.Decompress))
|
using(GZipStream decompressionStream = new GZipStream(ms, CompressionMode.Decompress))
|
||||||
{
|
{
|
||||||
using(MemoryStream outputStream = new MemoryStream())
|
using(MemoryStream outputStream = new MemoryStream())
|
||||||
{
|
{
|
||||||
WebUtil.CopyStream(decompressionStream,outputStream,int.MaxValue);
|
decompressionStream.CopyTo(outputStream,int.MaxValue);
|
||||||
// int compressedLength = asset.Data.Length;
|
// int compressedLength = asset.Data.Length;
|
||||||
asset.Data = outputStream.ToArray();
|
asset.Data = outputStream.ToArray();
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue