diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2022-01-14 10:56:50 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2022-01-14 21:04:10 +0100 |
| commit | a2eaf99e46f370ffb3b73828c2bdc53dc193b9a4 (patch) | |
| tree | 6d08d7b5077478a92acde6dd6e7278e98a409ce1 /ucbhelper/source/provider/resultsethelper.cxx | |
| parent | 49a5e69f567302633299bf6626a9d9b9544ee94b (diff) | |
make comphelper::OInterfaceContainerHelper4 more threadsafe
(*) make all the methods that require an external mutex take a
std::unique_lock as a parameter, so that call sites cannot forget
(*) make the forEach method drop the lock when firing listener methods,
to reduce the odds of deadlock
Change-Id: I0a80e3b3d1c1c03b7de4a658d31fcc2847690903
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128415
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'ucbhelper/source/provider/resultsethelper.cxx')
| -rw-r--r-- | ucbhelper/source/provider/resultsethelper.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ucbhelper/source/provider/resultsethelper.cxx b/ucbhelper/source/provider/resultsethelper.cxx index 25ead4bd8a22..6d750c82dbba 100644 --- a/ucbhelper/source/provider/resultsethelper.cxx +++ b/ucbhelper/source/provider/resultsethelper.cxx @@ -90,7 +90,7 @@ void SAL_CALL ResultSetImplHelper::dispose() { std::unique_lock aGuard( m_aMutex ); - if ( m_aDisposeEventListeners.getLength() ) + if ( m_aDisposeEventListeners.getLength(aGuard) ) { lang::EventObject aEvt; aEvt.Source = static_cast< lang::XComponent * >( this ); @@ -105,7 +105,7 @@ void SAL_CALL ResultSetImplHelper::addEventListener( { std::unique_lock aGuard( m_aMutex ); - m_aDisposeEventListeners.addInterface( Listener ); + m_aDisposeEventListeners.addInterface( aGuard, Listener ); } @@ -115,7 +115,7 @@ void SAL_CALL ResultSetImplHelper::removeEventListener( { std::unique_lock aGuard( m_aMutex ); - m_aDisposeEventListeners.removeInterface( Listener ); + m_aDisposeEventListeners.removeInterface( aGuard, Listener ); } |