diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2019-05-21 18:52:54 +0200 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2019-05-21 21:54:04 +0200 |
| commit | 165327d4ae442fb33b634577c32fe692a9293457 (patch) | |
| tree | 921ea9217817f0506809e715a3988d134ec5f4dd /ucb | |
| parent | c43534d5e8d33f73ee4ba70867065be675302579 (diff) | |
tdf#125424: properly reset temporarily cleared guard
Since the guard is only cleared optionally, most probably the code after
the conditional block is expected to be guarded until the second clear.
Change-Id: I913cb4bff42140da605a6f45414bece419f4a4c8
Reviewed-on: https://gerrit.libreoffice.org/72689
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'ucb')
| -rw-r--r-- | ucb/source/ucp/hierarchy/hierarchycontent.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ucb/source/ucp/hierarchy/hierarchycontent.cxx b/ucb/source/ucp/hierarchy/hierarchycontent.cxx index e0ac3c81fda7..923225a1df90 100644 --- a/ucb/source/ucp/hierarchy/hierarchycontent.cxx +++ b/ucb/source/ucp/hierarchy/hierarchycontent.cxx @@ -1002,7 +1002,7 @@ uno::Sequence< uno::Any > HierarchyContent::setPropertyValues( const uno::Sequence< beans::PropertyValue >& rValues, const uno::Reference< ucb::XCommandEnvironment > & xEnv ) { - osl::ClearableGuard< osl::Mutex > aGuard( m_aMutex ); + osl::ResettableGuard< osl::Mutex > aGuard( m_aMutex ); uno::Sequence< uno::Any > aRet( rValues.getLength() ); uno::Sequence< beans::PropertyChangeEvent > aChanges( rValues.getLength() ); @@ -1253,6 +1253,7 @@ uno::Sequence< uno::Any > HierarchyContent::setPropertyValues( "Exchange failed!", static_cast< cppu::OWeakObject * >( this ) ); } + aGuard.reset(); } if ( !aOldTitle.isEmpty() ) |