Imported Upstream version 4.6.0.125

Former-commit-id: a2155e9bd80020e49e72e86c44da02a8ac0e57a4
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2016-08-03 10:59:49 +00:00
parent a569aebcfd
commit e79aa3c0ed
17047 changed files with 3137615 additions and 392334 deletions

View File

@@ -95,8 +95,10 @@ namespace System.IO.Packaging {
{
// Ensure that all the data has been read out of the package
// stream already. Otherwise we'll lose data when we recreate the zip
foreach (ZipPackagePart part in Parts.Values)
part.GetStream ().Dispose ();
foreach (ZipPackagePart part in Parts.Values) {
if (part.Package != null)
part.GetStream ().Dispose ();
}
// Empty the package stream
PackageStream.Position = 0;
@@ -107,6 +109,9 @@ namespace System.IO.Packaging {
// Write all the part streams
foreach (ZipPackagePart part in Parts.Values) {
if (part.Package == null)
continue;
Stream partStream = part.GetStream ();
partStream.Seek (0, SeekOrigin.Begin);