core.git: Branch 'libreoffice-24-8' - ucb/source

[Caolán McNamara (via logerrit)]

 ucb/source/cacher/cachedcontentresultsetstub.cxx |    2 +-
 ucb/source/cacher/contentresultsetwrapper.cxx    |    8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 0eb43b8710b86d00e916d4158a519df5b54a348c
Author:     Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Tue Jul 16 09:05:40 2024 +0100
Commit:     Michael Stahl <michael.st...@allotropia.de>
CommitDate: Wed Jul 17 10:30:13 2024 +0200

    cid#1606914 Double lock
    
    and
    
    cid#1607256 Double lock
    cid#1608253 Double lock
    cid#1608333 Double lock
    
    probably since:
    
    commit 155dd761e85600445e95f1f2a844d44544446a64
    Author:     Noel Grandin <noel.gran...@collabora.co.uk>
    AuthorDate: Mon Feb 13 19:00:27 2023 +0200
    
        osl::Mutex->std::mutex in ContentResultSetWrapper
    
    Change-Id: I93864a3fbf9596f1f02d882592e904fd80d25da6
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/170551
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <michael.st...@allotropia.de>

diff --git a/ucb/source/cacher/cachedcontentresultsetstub.cxx 
b/ucb/source/cacher/cachedcontentresultsetstub.cxx
index 6064e7f6ff21..5e8fe8f2f934 100644
--- a/ucb/source/cacher/cachedcontentresultsetstub.cxx
+++ b/ucb/source/cacher/cachedcontentresultsetstub.cxx
@@ -386,7 +386,7 @@ void CachedContentResultSetStub
     {
         //check whether the properties 'FetchSize' and 'FetchDirection' do 
exist
 
-        Reference< XPropertySetInfo > xPropertySetInfo = getPropertySetInfo();
+        Reference< XPropertySetInfo > xPropertySetInfo = 
getPropertySetInfoImpl(rGuard);
         bool bHasSize = xPropertySetInfo->hasPropertyByName( 
m_aPropertyNameForFetchSize );
         bool bHasDirection = xPropertySetInfo->hasPropertyByName( 
m_aPropertyNameForFetchDirection );
 
diff --git a/ucb/source/cacher/contentresultsetwrapper.cxx 
b/ucb/source/cacher/contentresultsetwrapper.cxx
index 2fca4e90d4c9..32cdc98e9c25 100644
--- a/ucb/source/cacher/contentresultsetwrapper.cxx
+++ b/ucb/source/cacher/contentresultsetwrapper.cxx
@@ -413,7 +413,7 @@ void SAL_CALL 
ContentResultSetWrapper::addPropertyChangeListener( const OUString
     std::unique_lock aGuard( m_aMutex );
     impl_EnsureNotDisposed(aGuard);
 
-    if( !getPropertySetInfo().is() )
+    if( !getPropertySetInfoImpl(aGuard).is() )
     {
         OSL_FAIL( "broadcaster was disposed already" );
         throw UnknownPropertyException();
@@ -455,7 +455,7 @@ void SAL_CALL 
ContentResultSetWrapper::addVetoableChangeListener( const OUString
     std::unique_lock aGuard( m_aMutex );
     impl_EnsureNotDisposed(aGuard);
 
-    if( !getPropertySetInfo().is() )
+    if( !getPropertySetInfoImpl(aGuard).is() )
     {
         OSL_FAIL( "broadcaster was disposed already" );
         throw UnknownPropertyException();
@@ -509,7 +509,7 @@ void SAL_CALL 
ContentResultSetWrapper::removePropertyChangeListener( const OUStr
     {
         if( !rPropertyName.isEmpty() )
         {
-            if( !getPropertySetInfo().is() )
+            if( !getPropertySetInfoImpl(aGuard).is() )
                 throw UnknownPropertyException();
 
             m_xPropertySetInfo->getPropertyByName( rPropertyName );
@@ -557,7 +557,7 @@ void SAL_CALL 
ContentResultSetWrapper::removeVetoableChangeListener( const OUStr
     {
         if( !rPropertyName.isEmpty() )
         {
-            if( !getPropertySetInfo().is() )
+            if( !getPropertySetInfoImpl(aGuard).is() )
                 throw UnknownPropertyException(rPropertyName);
 
             m_xPropertySetInfo->getPropertyByName( rPropertyName );