strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

autorecovery: connect: lock SolarMutex before locking own mutex (makes UISettings complex test case run, again)

Browse source
This commit is contained in:
Frank Schoenheit [fs] 2010-02-22 10:52:01 +01:00
parent d28b920406
commit 8dd0c9c3f9
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
dbaccess/source/ui/app/AppControllerGen.cxx
View file

@ -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();
}