summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThorsten Behrens <Thorsten.Behrens@CIB.de>2018-09-27 22:07:33 +0200
committerThorsten Behrens <Thorsten.Behrens@CIB.de>2018-09-27 22:10:57 +0200
commit9d0088c380e659596e838c0a4b63d68a775ab710 (patch)
treee438921484540fa52eaa5419de5d4ee44d582005
parent6d96af4266b4fd1b5adb464c7b877426bf49f520 (diff)
Revert "framework: mutex locking revision"feature/cib_contract935
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"
-rw-r--r--[-rwxr-xr-x]framework/inc/dispatch/interceptionhelper.hxx0
-rw-r--r--framework/source/dispatch/interceptionhelper.cxx6
2 files changed, 5 insertions, 1 deletions
diff --git a/framework/inc/dispatch/interceptionhelper.hxx b/framework/inc/dispatch/interceptionhelper.hxx
index ee6ae9db1b97..ee6ae9db1b97 100755..100644
--- a/framework/inc/dispatch/interceptionhelper.hxx
+++ b/framework/inc/dispatch/interceptionhelper.hxx
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);