mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Hold the SolarMutex while updating properties; thanks to sberg.

Browse Source 
Change-Id: Id9dc4c7e083da2a8d44c7295a8b605de81bca1ef
Reviewed-on: https://gerrit.libreoffice.org/19272
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
This commit is contained in:
Michael Meeks 2015-10-09 11:26:38 +01:00
parent f76b3dd039
commit c0096b5b84
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
comphelper/source/misc/configuration.cxx
View File

@ -26,6 +26,7 @@
#include <com/sun/star/uno/Any.hxx>
#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/uno/XComponentContext.hpp>
#include <comphelper/solarmutex.hxx>
#include <comphelper/configuration.hxx>
#include <comphelper/configurationlistener.hxx>
#include <rtl/instance.hxx>
@ -248,6 +249,12 @@ void SAL_CALL comphelper::ConfigurationListener::propertyChange(
css::beans::PropertyChangeEvent const &rEvt )
throw (css::uno::RuntimeException, std::exception)
{
// Code is commonly used inside the SolarMutexGuard
// so to avoid concurrent writes to the property,
// and allow fast, lock-less access, guard here.
rtl::Reference< comphelper::SolarMutex > xMutexGuard(
comphelper::SolarMutex::get() );
assert( rEvt.Source == mxConfig );
for ( auto it = maListeners.begin(); it != maListeners.end(); ++it )
{

1
include/comphelper/configurationlistener.hxx
View File

@ -37,6 +37,7 @@ public:
void dispose() { mxListener.clear(); }
};
/// Access to this class must be protected by the SolarMutex
template< typename uno_type > class ConfigurationListenerProperty : public ConfigurationListenerPropertyBase
{
uno_type maValue;