haeaeae/duplicati
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #4249 from jpschewe/report-compression-errors

Browse Source 
Ensure that compression errors are thrown and logged.

This also prevents FilesetVolumeWriter.Dispose from calling Close prematurely, which
can result in a JsonWriter exception.
This commit is contained in:
warwickmm
2020-07-11 16:49:10 -07:00
committed by GitHub
parent f44428ea70 e5f57e8f66
commit 45da5a4e2b
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Duplicati/Library/Main/Volumes/FilesetVolumeWriter.cs
+13 -7
View File
@@ -135,9 +135,6 @@ namespace Duplicati.Library.Main.Volumes
if (m_streamwriter != null)
{
this.AddFilelistFile();
m_writer.Close();
m_streamwriter.Dispose();
m_streamwriter = null;
}
if (m_tempStream != null)
@@ -159,11 +156,20 @@ namespace Duplicati.Library.Main.Volumes
m_writer.Flush();
m_streamwriter.Flush();
using (Stream sr = m_compression.CreateFile(FILELIST, CompressionHint.Compressible, DateTime.UtcNow))
try
{
m_tempStream.Seek(0, SeekOrigin.Begin);
m_tempStream.CopyTo(sr);
sr.Flush();
using (Stream sr = m_compression.CreateFile(FILELIST, CompressionHint.Compressible, DateTime.UtcNow))
{
m_tempStream.Seek(0, SeekOrigin.Begin);
m_tempStream.CopyTo(sr);
sr.Flush();
}
}
finally
{
m_writer.Close();
m_streamwriter.Dispose();
m_streamwriter = null;
}
}