diff options
| author | Frank Schoenheit [fs] <frank.schoenheit@sun.com> | 2010-02-22 10:52:01 +0100 |
|---|---|---|
| committer | Frank Schoenheit [fs] <frank.schoenheit@sun.com> | 2010-02-22 10:52:01 +0100 |
| commit | 8dd0c9c3f9bc8e4d0152edfb00294c4227db4555 (patch) | |
| tree | 3247d2c1516312e3b8183303d47310177b89123a /dbaccess | |
| parent | d28b920406a67449c4e0d5018aa36c6dcf1162f8 (diff) | |
autorecovery: connect: lock SolarMutex before locking own mutex (makes UISettings complex test case run, again)
Diffstat (limited to 'dbaccess')
| -rw-r--r-- | dbaccess/source/ui/app/AppControllerGen.cxx | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/dbaccess/source/ui/app/AppControllerGen.cxx b/dbaccess/source/ui/app/AppControllerGen.cxx index 53a4440ee321..6df5b2d8ee63 100644 --- a/dbaccess/source/ui/app/AppControllerGen.cxx +++ b/dbaccess/source/ui/app/AppControllerGen.cxx @@ -374,6 +374,7 @@ Reference< XWindow > SAL_CALL OApplicationController::getApplicationMainWindow() // ----------------------------------------------------------------------------- Sequence< Reference< XComponent > > SAL_CALL OApplicationController::getSubComponents() throw (RuntimeException) { + ::osl::MutexGuard aGuard( getMutex() ); return m_pSubComponentManager->getSubComponents(); } @@ -394,6 +395,7 @@ Reference< XConnection > SAL_CALL OApplicationController::getActiveConnection() // ----------------------------------------------------------------------------- void SAL_CALL OApplicationController::connect( ) throw (SQLException, RuntimeException) { + ::vos::OGuard aSolarGuard(Application::GetSolarMutex()); ::osl::MutexGuard aGuard( getMutex() ); SQLExceptionInfo aError; @@ -432,6 +434,7 @@ beans::Pair< ::sal_Int32, ::rtl::OUString > SAL_CALL OApplicationController::ide // ----------------------------------------------------------------------------- ::sal_Bool SAL_CALL OApplicationController::closeSubComponents( ) throw (RuntimeException) { + ::vos::OGuard aSolarGuard(Application::GetSolarMutex()); ::osl::MutexGuard aGuard( getMutex() ); return m_pSubComponentManager->closeSubComponents(); } |