mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

#81393# createInstanceEveryTime was not thread save

Browse Source
This commit is contained in:
Lars Langhans
2000-12-06 08:36:29 +00:00
parent 8981a051c3
commit b2e87219b4
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
cppuhelper/source/factory.cxx
View File

@@ -2,9 +2,9 @@
* *
* $RCSfile: factory.cxx,v $ * $RCSfile: factory.cxx,v $
* *
* $Revision: 1.2 $ * $Revision: 1.3 $
* *
* last change: $Author: jsc $ $Date: 2000-10-18 13:20:58 $ * last change: $Author: lla $ $Date: 2000-12-06 09:36:29 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
@@ -437,9 +437,11 @@ Reference<XInterface > ORegistryFactoryHelper::createInstanceEveryTime()
if( !xModuleFactory.is() ) if( !xModuleFactory.is() )
{ {
MutexGuard aGuard( aMutex ); MutexGuard aGuard( aMutex );
xModuleFactory = createModuleFactory(); if( !xModuleFactory.is() ) // is xModuleFactory really not set (MultiThreaded!)
{
xModuleFactory = createModuleFactory();
}
} }
if( xModuleFactory.is() ) if( xModuleFactory.is() )
return xModuleFactory->createInstance(); return xModuleFactory->createInstance();
@@ -535,7 +537,10 @@ Reference<XInterface > SAL_CALL ORegistryFactoryHelper::createInstanceWithArgume
if( !xModuleFactory.is() ) if( !xModuleFactory.is() )
{ {
MutexGuard aGuard( aMutex ); MutexGuard aGuard( aMutex );
xModuleFactory = createModuleFactory(); if( !xModuleFactory.is() ) // MultiThreaded!
{
xModuleFactory = createModuleFactory();
}
} }
if( xModuleFactory.is() ) if( xModuleFactory.is() )