diff options
| author | Mohammed Abdul Azeem <azeemmysore@gmail.com> | 2017-06-08 13:32:42 +0530 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2017-06-08 12:50:17 +0200 |
| commit | d21a675d3a7deff37fd66adc993d0179d3a39ed7 (patch) | |
| tree | 54d3464355fa8eb74fcd370cbdc9d59f37ddca9f /package/source/zippackage | |
| parent | 630186ff4e0eba7317e542f8c3eca39ebd068721 (diff) | |
Fixing loose ends for multithread Sync in package/:
Mutexes in different classes operate exclusively, which might
cause sync problem when multithreads are involved. This
patch shares the mutex across all classes that share
the underlying stream.
Change-Id: I57e549fb7c375f93955bf54886b91b1892db1e27
Reviewed-on: https://gerrit.libreoffice.org/38563
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Tested-by: Michael Meeks <michael.meeks@collabora.com>
Diffstat (limited to 'package/source/zippackage')
| -rw-r--r-- | package/source/zippackage/ZipPackage.cxx | 4 | ||||
| -rw-r--r-- | package/source/zippackage/ZipPackageStream.cxx | 2 | ||||
| -rw-r--r-- | package/source/zippackage/zipfileaccess.cxx | 1 |
3 files changed, 4 insertions, 3 deletions
diff --git a/package/source/zippackage/ZipPackage.cxx b/package/source/zippackage/ZipPackage.cxx index 90272bbee62b..61faad5600c1 100644 --- a/package/source/zippackage/ZipPackage.cxx +++ b/package/source/zippackage/ZipPackage.cxx @@ -725,7 +725,7 @@ void SAL_CALL ZipPackage::initialize( const uno::Sequence< Any >& aArguments ) OUString message; try { - m_pZipFile = o3tl::make_unique<ZipFile>(m_xContentStream, m_xContext, true, m_bForceRecovery); + m_pZipFile = o3tl::make_unique<ZipFile>(m_aMutexHolder, m_xContentStream, m_xContext, true, m_bForceRecovery); m_pZipFile->setUseBufferedStream(bUseBufferedStream); getZipFileContents(); } @@ -1090,7 +1090,7 @@ void ZipPackage::ConnectTo( const uno::Reference< io::XInputStream >& xInStream if ( m_pZipFile ) m_pZipFile->setInputStream( m_xContentStream ); else - m_pZipFile = o3tl::make_unique<ZipFile>(m_xContentStream, m_xContext, false); + m_pZipFile = o3tl::make_unique<ZipFile>(m_aMutexHolder, m_xContentStream, m_xContext, false); } namespace diff --git a/package/source/zippackage/ZipPackageStream.cxx b/package/source/zippackage/ZipPackageStream.cxx index 01f2896d68f0..8607f4a2c583 100644 --- a/package/source/zippackage/ZipPackageStream.cxx +++ b/package/source/zippackage/ZipPackageStream.cxx @@ -1047,7 +1047,7 @@ uno::Reference< io::XInputStream > SAL_CALL ZipPackageStream::getDataStream() return xResult; } else if ( m_nStreamMode == PACKAGE_STREAM_RAW ) - return ZipFile::StaticGetDataFromRawStream( m_xContext, GetOwnSeekStream(), GetEncryptionData() ); + return ZipFile::StaticGetDataFromRawStream( m_rZipPackage.GetSharedMutexRef(), m_xContext, GetOwnSeekStream(), GetEncryptionData() ); else if ( GetOwnSeekStream().is() ) { return new WrapStreamForShare( GetOwnSeekStream(), m_rZipPackage.GetSharedMutexRef() ); diff --git a/package/source/zippackage/zipfileaccess.cxx b/package/source/zippackage/zipfileaccess.cxx index ce4e82de8867..7517e772caf2 100644 --- a/package/source/zippackage/zipfileaccess.cxx +++ b/package/source/zippackage/zipfileaccess.cxx @@ -247,6 +247,7 @@ void SAL_CALL OZipFileAccess::initialize( const uno::Sequence< uno::Any >& aArgu // TODO: in case xSeekable is implemented on separated XStream implementation a wrapper is required m_pZipFile = o3tl::make_unique<ZipFile>( + m_aMutexHolder, m_xContentStream, m_xContext, true ); |