diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-04-19 12:48:47 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-04-19 12:48:47 +0000 |
| commit | 9d70ef32f372ff01045cea34b3461951c9786cc5 (patch) | |
| tree | 7941fc37d5b7d17739e6c69bf1bb2a24ac14de13 /cppu/source/threadpool/jobqueue.cxx | |
| parent | 05116339d5b5a33e7f00bc5afb0ffba26d76240b (diff) | |
INTEGRATION: CWS sb49 (1.3.38); FILE MERGED
2006/03/22 10:14:04 sb 1.3.38.1: #i63397# Keep objects alive long enough so that threads still running while atexit handlers are processed do not access dead objects.
Diffstat (limited to 'cppu/source/threadpool/jobqueue.cxx')
| -rw-r--r-- | cppu/source/threadpool/jobqueue.cxx | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/cppu/source/threadpool/jobqueue.cxx b/cppu/source/threadpool/jobqueue.cxx index 94d13fb3f252..accc4587b214 100644 --- a/cppu/source/threadpool/jobqueue.cxx +++ b/cppu/source/threadpool/jobqueue.cxx @@ -4,9 +4,9 @@ * * $RCSfile: jobqueue.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: rt $ $Date: 2005-09-08 08:45:56 $ + * last change: $Author: hr $ $Date: 2006-04-19 13:48:46 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -68,13 +68,15 @@ namespace cppu_threadpool { m_nToDo ++; } - void *JobQueue::enter( sal_Int64 nDisposeId , sal_Bool bReturnWhenNoJob ) + void *JobQueue::enter( + DisposedCallerAdmin & disposedCallerAdmin, sal_Int64 nDisposeId, + sal_Bool bReturnWhenNoJob ) { void *pReturn = 0; { // synchronize with the dispose calls MutexGuard guard( m_mutex ); - if( DisposedCallerAdmin::getInstance()->isDisposed( nDisposeId ) ) + if( disposedCallerAdmin.isDisposed( nDisposeId ) ) { return 0; } |