[Libreoffice-commits] core.git: Branch 'feature/cib_contract935' - framework/inc framework/source

[Libreoffice Gerrit user]

 framework/source/dispatch/interceptionhelper.cxx |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 9d0088c380e659596e838c0a4b63d68a775ab710
Author:     Thorsten Behrens <Thorsten.Behrens at CIB.de>
AuthorDate: Thu Sep 27 22:07:33 2018 +0200
Commit:     Thorsten Behrens <Thorsten.Behrens at CIB.de>
CommitDate: Thu Sep 27 22:10:57 2018 +0200

    Revert "framework: mutex locking revision"
    
     Revert "framework: remove solarmutex blocking since we are using own mutex"
     Revert "framework: fix compile error of b98bef638e7352918dd487c6dd0769e9e896a61e"
     Revert "Revert "debug: let's disable dispatch interceptors for a while""
     Revert "framework: use own mutex for interceptors call"
     Revert "debug: let's disable dispatch interceptors for a while"

diff --git a/framework/inc/dispatch/interceptionhelper.hxx b/framework/inc/dispatch/interceptionhelper.hxx
old mode 100755
new mode 100644
diff --git a/framework/source/dispatch/interceptionhelper.cxx b/framework/source/dispatch/interceptionhelper.cxx
index 55ee63ba1e83..c7ef6cf62448 100644
--- a/framework/source/dispatch/interceptionhelper.cxx
+++ b/framework/source/dispatch/interceptionhelper.cxx
@@ -43,7 +43,8 @@ css::uno::Reference< css::frame::XDispatch > SAL_CALL InterceptionHelper::queryD
                                                                                               sal_Int32        nSearchFlags    )
     throw(css::uno::RuntimeException, std::exception)
 {
-    SolarMutexGuard aLock;
+    // SAFE {
+    SolarMutexClearableGuard aReadLock;
 
     // a) first search an interceptor, which match to this URL by its URL pattern registration
     //    Note: if it return NULL - it does not mean an empty interceptor list automatically!
@@ -76,6 +77,9 @@ css::uno::Reference< css::frame::XDispatch > SAL_CALL InterceptionHelper::queryD
     if (!xInterceptor.is() && m_xSlave.is())
         xInterceptor = m_xSlave;
 
+    aReadLock.clear();
+    // } SAFE
+
     css::uno::Reference< css::frame::XDispatch > xReturn;
     if (xInterceptor.is())
         xReturn = xInterceptor->queryDispatch(aURL, sTargetFrameName, nSearchFlags);