commit 3fcd2ccb443653740d114b3e4dc371c6b0b6525b
author Kohei Yoshida <kohei.yoshida@collabora.com> Mon Dec 15 15:03:51 2014 -0500
committer Kohei Yoshida <kohei.yoshida@collabora.com> Mon Dec 15 15:13:44 2014 -0500
tree 8af44aca042ad1d17ff9d5eeb06fc29c05fb23a8
parent 9dc134a6df9255b4ca294cd2e9b88026624e6125

fdo#87210: Re-enable parallel deflate, which was not the root cause.

With f92183833fa569006602ac7e93c906d2094e0d4d, export no longer crashes,
and there is no reason to leave this piece disabled any more.  Let's
re-enable this.

Change-Id: Ibeca8869f152cbcd80f1dcb55f8199110125741d

package/source/zippackage/ZipPackageStream.cxx

diff --git a/package/source/zippackage/ZipPackageStream.cxx b/package/source/zippackage/ZipPackageStream.cxx
index 54d0def..e22b234 100644
--- a/package/source/zippackage/ZipPackageStream.cxx
+++ b/package/source/zippackage/ZipPackageStream.cxx
@@ -810,8 +810,6 @@ bool ZipPackageStream::saveChild(
                if (xSeek.is() && xSeek->getLength() < 100000)
                    bParallelDeflate = false;

                bParallelDeflate = false; // globally disable parallel deflate for now.

                if (bParallelDeflate)
                {
                    // Start a new thread deflating this zip entry