ucb/source/ucp/file/filtask.cxx | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit 5d390a6f368663da08e83a32ab0ae0976616241a
Author: Michael Meeks <michael.me...@collabora.com>
AuthorDate: Mon Mar 19 10:43:24 2018 +0000
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Fri Aug 24 08:06:24 2018 +0200
tdf#116489 - fix ucb TaskManager deadlock.
Change-Id: Ia362db52e7b078203964704569e1d54f053f2b57
Reviewed-on: https://gerrit.libreoffice.org/51544
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Michael Meeks <michael.me...@collabora.com>
(cherry picked from commit 5b1442ec1e6946ec3a3b9d8cfdd57ac1437d23ab)
diff --git a/ucb/source/ucp/file/filtask.cxx b/ucb/source/ucp/file/filtask.cxx
index 22cc98fdff98..fcbdc82f658a 100644
--- a/ucb/source/ucp/file/filtask.cxx
+++ b/ucb/source/ucp/file/filtask.cxx
@@ -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,
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
