Tag: cws_src680_dba201b User: fs Date: 05/07/29 02:23:59 Modified: /dba/dbaccess/source/ui/browser/ genericcontroller.cxx
Log: #i52602# lock SolarMutex in ::dispatch File Changes: Directory: /dba/dbaccess/source/ui/browser/ =========================================== File [changed]: genericcontroller.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/browser/genericcontroller.cxx?r1=1.64.2.1&r2=1.64.2.2 Delta lines: +9 -2 ------------------- --- genericcontroller.cxx 11 Jul 2005 13:37:14 -0000 1.64.2.1 +++ genericcontroller.cxx 29 Jul 2005 09:23:54 -0000 1.64.2.2 @@ -2,9 +2,9 @@ * * $RCSfile: genericcontroller.cxx,v $ * - * $Revision: 1.64.2.1 $ + * $Revision: 1.64.2.2 $ * - * last change: $Author: fs $ $Date: 2005/07/11 13:37:14 $ + * last change: $Author: fs $ $Date: 2005/07/29 09:23:54 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -740,6 +740,13 @@ // ----------------------------------------------------------------------- void OGenericUnoController::dispatch(const URL& _aURL, const Sequence< PropertyValue >& aArgs) throw(RuntimeException) { + ::vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + // Since the fix for #123967#, the SolarMutex is not locked anymore when the framework calls into + // here. So, lock it ourself. The real solution would be to lock it only in the places + // where it's needed, but a) this might turn out difficult, since we then also need to care + // for locking in the proper order (SolarMutex and m_aMutex), and b) this would be too many places + // for the time frame of the fix. + // #i52602# / [EMAIL PROTECTED] / 2005-07-29 executeUnChecked(_aURL,aArgs); } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
