diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2018-03-19 10:43:24 +0000 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2018-03-19 18:24:37 +0100 |
| commit | 87c70df3d17d222f738054c49d5349a1de2806ec (patch) | |
| tree | be4600ad0ed581d608af14754d68e91d479464cc /ucb | |
| parent | 855ae519db73b81a64d991b99c8993e6a192df08 (diff) | |
tdf#116489 - fix ucb TaskManager deadlock.
Change-Id: Ia362db52e7b078203964704569e1d54f053f2b57
Reviewed-on: https://gerrit.libreoffice.org/51544
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
(cherry picked from commit 5b1442ec1e6946ec3a3b9d8cfdd57ac1437d23ab)
Reviewed-on: https://gerrit.libreoffice.org/51554
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'ucb')
| -rw-r--r-- | ucb/source/ucp/file/filtask.cxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/ucb/source/ucp/file/filtask.cxx b/ucb/source/ucp/file/filtask.cxx index 9b49b26c5be7..6f4f54a16af2 100644 --- a/ucb/source/ucp/file/filtask.cxx +++ b/ucb/source/ucp/file/filtask.cxx @@ -418,7 +418,7 @@ TaskManager::endTask( sal_Int32 CommandId, const OUString& aUncPath, BaseContent* pContent) { - osl::MutexGuard aGuard( m_aMutex ); + osl::ClearableMutexGuard aGuard( m_aMutex ); TaskMap::iterator it = m_aTaskMap.find( CommandId ); if( it == m_aTaskMap.end() ) return; @@ -432,6 +432,8 @@ TaskManager::endTask( sal_Int32 CommandId, m_aTaskMap.erase( it ); + aGuard.clear(); + if( ErrorCode != TASKHANDLER_NO_ERROR ) throw_handler( ErrorCode, |