Kaydet (Commit) b2832bf6 authored tarafından Michael Meeks's avatar Michael Meeks Kaydeden (comit) Andras Timar

tdf#116489 - fix ucb TaskManager deadlock.

Change-Id: Ia362db52e7b078203964704569e1d54f053f2b57
Reviewed-on: https://gerrit.libreoffice.org/51544Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarMichael Meeks <michael.meeks@collabora.com>
(cherry picked from commit 5b1442ec)
Reviewed-on: https://gerrit.libreoffice.org/51908Reviewed-by: 's avatarAndras Timar <andras.timar@collabora.com>
Tested-by: 's avatarAndras Timar <andras.timar@collabora.com>
üst fd913f94
......@@ -65,7 +65,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;
......@@ -79,6 +79,8 @@ TaskManager::endTask( sal_Int32 CommandId,
m_aTaskMap.erase( it );
aGuard.clear();
if( ErrorCode != TASKHANDLER_NO_ERROR )
throw_handler(
ErrorCode,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment