core.git: ucb/source

[Caolán McNamara (via logerrit)]

 ucb/source/ucp/webdav-curl/SerfLockStore.cxx |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

New commits:
commit 96a4272a84a33b939411bb99d1024cbb2bdaf046
Author:     Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Tue Feb 18 08:35:27 2025 +0000
Commit:     Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Tue Feb 18 14:10:37 2025 +0100

    cid#1642989 Double lock
    
    since:
    
    commit 867d380b0b8e2c59689eb42665c75aad34733bbc
    Commit:     Michael Stahl <michael.st...@allotropia.de>
    
        tdf#161168 Improve constant repetitive loop thread
    
    Change-Id: If8e70322db88f2356aebd6799449a542c0d8bdfb
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/181818
    Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
    Tested-by: Jenkins

diff --git a/ucb/source/ucp/webdav-curl/SerfLockStore.cxx 
b/ucb/source/ucp/webdav-curl/SerfLockStore.cxx
index b191709a84e1..c12bdfedf6de 100644
--- a/ucb/source/ucp/webdav-curl/SerfLockStore.cxx
+++ b/ucb/source/ucp/webdav-curl/SerfLockStore.cxx
@@ -222,7 +222,7 @@ void 
SerfLockStore::removeLockImpl(std::unique_lock<std::mutex> & rGuard, const
     }
 }
 
-std::chrono::milliseconds 
SerfLockStore::refreshLocks(std::unique_lock<std::mutex>&rGuard)
+std::chrono::milliseconds 
SerfLockStore::refreshLocks(std::unique_lock<std::mutex>& rGuard)
 {
     assert(rGuard.owns_lock());
     (void)rGuard;
@@ -231,8 +231,6 @@ std::chrono::milliseconds 
SerfLockStore::refreshLocks(std::unique_lock<std::mute
     osl_getSystemTime(&currentTimeVal);
     sal_Int32 currentTime = currentTimeVal.Seconds;
 
-    std::unique_lock aGuard( m_aMutex );
-
     ::std::vector<OUString> authFailedLocks;
     std::chrono::milliseconds min_remaining = std::chrono::milliseconds::max();
 
@@ -282,7 +280,7 @@ std::chrono::milliseconds 
SerfLockStore::refreshLocks(std::unique_lock<std::mute
 
     for (auto const& rLock : authFailedLocks)
     {
-        removeLockImpl(aGuard, rLock);
+        removeLockImpl(rGuard, rLock);
     }
 
     return min_remaining;