AuroraMiddleware/scuffed-code
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ICU-2970 Thread Safety fixes to RBBI Service Registration

Browse Source 
X-SVN-Rev: 12422
This commit is contained in:
Andy Heninger 2003-06-10 21:36:36 +00:00
parent f8c3e58100
commit 96c4ddb1c9
1 changed files with 39 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
icu4c/source/common/brkiter.cpp
View File

@ -351,13 +351,31 @@ public:
static ICULocaleService*
getService(void)
{
if (gService == NULL) {
Mutex mutex;
if (gService == NULL) {
gService = new ICUBreakIteratorService();
UBool needsInit;
umtx_lock(NULL);
needsInit = (UBool)(gService == NULL);
umtx_unlock(NULL);
if (needsInit) {
ICULocaleService *tService = new ICUBreakIteratorService();
umtx_lock(NULL);
if (gService == NULL) {
gService = tService;
tService = NULL;
}
umtx_unlock(NULL);
delete tService;
}
}
return gService;
return gService;
}
// -------------------------------------
static UBool
hasService(void)
{
Mutex mutex;
return gService != NULL;
}
// -------------------------------------
@ -365,11 +383,15 @@ getService(void)
BreakIterator*
BreakIterator::createInstance(const Locale& loc, UBreakIteratorType kind, UErrorCode& status)
{
if (gService != NULL) {
return (BreakIterator*)gService->get(loc, kind, status);
} else {
return makeInstance(loc, kind, status);
}
if (U_FAILURE(status)) {
return NULL;
}
if (hasService()) {
return (BreakIterator*)gService->get(loc, kind, status);
} else {
return makeInstance(loc, kind, status);
}
}
// -------------------------------------
@ -385,13 +407,13 @@ BreakIterator::registerInstance(BreakIterator* toAdopt, const Locale& locale, UB
UBool
BreakIterator::unregister(URegistryKey key, UErrorCode& status)
{
if (U_SUCCESS(status)) {
if (gService != NULL) {
return gService->unregister(key, status);
if (U_SUCCESS(status)) {
if (hasService()) {
return gService->unregister(key, status);
}
status = U_ILLEGAL_ARGUMENT_ERROR;
}
status = U_ILLEGAL_ARGUMENT_ERROR;
}
return FALSE;
return FALSE;
}
// -------------------------------------