diff options
author | Mike Kaganski <mike.kaganski@collabora.com> | 2019-07-08 23:47:12 +1000 |
---|---|---|
committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2019-12-18 00:45:26 +0100 |
commit | d49602781e920c008ee3a38df5bd6c14552e0a24 (patch) | |
tree | 64b79a2a75628556fa69d53820c8b6928ddaa13a /ucb | |
parent | 6dcfaa015d1dfd345c396d756a476dba80f182a2 (diff) |
tdf#126279 related: remove locks from NeonLockStore after NE_AUTH error
Change-Id: Idbbb9bb215e3a56e72a29f798c5a5f84afaf2213
Reviewed-on: https://gerrit.libreoffice.org/75224
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
(cherry picked from commit 94e4695bcfcb9356d37942c47359b94531ef7b95)
Diffstat (limited to 'ucb')
-rw-r--r-- | ucb/source/ucp/webdav-neon/NeonLockStore.cxx | 13 | ||||
-rw-r--r-- | ucb/source/ucp/webdav-neon/NeonLockStore.hxx | 2 | ||||
-rw-r--r-- | ucb/source/ucp/webdav-neon/NeonSession.cxx | 1 |
3 files changed, 15 insertions, 1 deletions
diff --git a/ucb/source/ucp/webdav-neon/NeonLockStore.cxx b/ucb/source/ucp/webdav-neon/NeonLockStore.cxx index 390d58c4e8cb..85b821b2bd87 100644 --- a/ucb/source/ucp/webdav-neon/NeonLockStore.cxx +++ b/ucb/source/ucp/webdav-neon/NeonLockStore.cxx @@ -153,7 +153,7 @@ void NeonLockStore::stopTicker(osl::ClearableMutexGuard & rGuard) rGuard.clear(); - if (pTickerThread.is()) + if (pTickerThread.is() && pTickerThread->getIdentifier() != osl::Thread::getCurrentIdentifier()) pTickerThread->join(); // without m_aMutex locked (to prevent deadlock) } @@ -198,6 +198,13 @@ void NeonLockStore::removeLock( NeonLock * pLock ) stopTicker(aGuard); } +void NeonLockStore::removeLockDeferred(NeonLock* pLock) +{ + osl::MutexGuard aGuard(m_aMutex); + + m_aRemoveDeferred.push_back(pLock); +} + void NeonLockStore::refreshLocks() { osl::MutexGuard aGuard( m_aMutex ); @@ -233,6 +240,10 @@ void NeonLockStore::refreshLocks() } ++it; } + // removeLock will not need to actually release the lock, because this is run from TickerThread + for (auto pLock : m_aRemoveDeferred) + removeLock(pLock); + m_aRemoveDeferred.clear(); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/ucb/source/ucp/webdav-neon/NeonLockStore.hxx b/ucb/source/ucp/webdav-neon/NeonLockStore.hxx index 7a76a321ced6..fa64cb320374 100644 --- a/ucb/source/ucp/webdav-neon/NeonLockStore.hxx +++ b/ucb/source/ucp/webdav-neon/NeonLockStore.hxx @@ -66,6 +66,7 @@ class NeonLockStore ne_lock_store * m_pNeonLockStore; rtl::Reference< TickerThread > m_pTickerThread; LockInfoMap m_aLockInfoMap; + std::vector<NeonLock*> m_aRemoveDeferred; public: NeonLockStore(); @@ -82,6 +83,7 @@ public: sal_Int32 nLastChanceToSendRefreshRequest ); void removeLock( NeonLock * pLock ); + void removeLockDeferred(NeonLock* pLock); void refreshLocks(); diff --git a/ucb/source/ucp/webdav-neon/NeonSession.cxx b/ucb/source/ucp/webdav-neon/NeonSession.cxx index dfeba0acbabd..c1336c07a9c0 100644 --- a/ucb/source/ucp/webdav-neon/NeonSession.cxx +++ b/ucb/source/ucp/webdav-neon/NeonSession.cxx @@ -1631,6 +1631,7 @@ bool NeonSession::LOCK( NeonLock * pLock, { // tdf#126279: see handling of NE_AUTH in HandleError m_bNeedNewSession = true; + m_aNeonLockStore.removeLockDeferred(pLock); } return false; } |