diff options
| author | Kurt Zenker <kz@openoffice.org> | 2006-04-26 19:50:06 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2006-04-26 19:50:06 +0000 |
| commit | 2cb1f10fca598b30db3398320808f521b2416969 (patch) | |
| tree | 98b3b1a82620eca388e8037e5552cac6d2f43f82 /cppu/source/threadpool/thread.cxx | |
| parent | 54ec29f38981421ef2b500c215599591a7d49a92 (diff) | |
INTEGRATION: CWS jsc9 (1.8.2); FILE MERGED
2006/04/26 14:15:33 jsc 1.8.2.1: #134738# move fixes back to previous version
Diffstat (limited to 'cppu/source/threadpool/thread.cxx')
| -rw-r--r-- | cppu/source/threadpool/thread.cxx | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/cppu/source/threadpool/thread.cxx b/cppu/source/threadpool/thread.cxx index caf6910d1cae..9616d687023f 100644 --- a/cppu/source/threadpool/thread.cxx +++ b/cppu/source/threadpool/thread.cxx @@ -4,9 +4,9 @@ * * $RCSfile: thread.cxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: hr $ $Date: 2006-04-19 13:49:08 $ + * last change: $Author: kz $ $Date: 2006-04-26 20:50:06 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -120,13 +120,10 @@ namespace cppu_threadpool { } // ---------------------------------------------------------------------------------- - ORequestThread::ORequestThread( - rtl::Reference< ThreadPool > const & threadPool, - JobQueue *pQueue, - const ByteSequence &aThreadId, - sal_Bool bAsynchron ) + ORequestThread::ORequestThread( JobQueue *pQueue, + const ByteSequence &aThreadId, + sal_Bool bAsynchron ) : m_thread( 0 ) - , m_threadPool( threadPool ) , m_pQueue( pQueue ) , m_aThreadId( aThreadId ) , m_bAsynchron( bAsynchron ) @@ -196,13 +193,11 @@ namespace cppu_threadpool { // Note : Oneways should not get a disposable disposeid, // It does not make sense to dispose a call in this state. // That's way we put it an disposeid, that can't be used otherwise. - m_pQueue->enter( - m_threadPool->m_disposedCallerAdmin, (sal_Int64 ) this, - sal_True ); + m_pQueue->enter( (sal_Int64 ) this , sal_True ); if( m_pQueue->isEmpty() ) { - m_threadPool->revokeQueue( m_aThreadId , m_bAsynchron ); + ThreadPool::getInstance()->revokeQueue( m_aThreadId , m_bAsynchron ); // Note : revokeQueue might have failed because m_pQueue.isEmpty() // may be false (race). } @@ -216,7 +211,7 @@ namespace cppu_threadpool { uno_releaseIdFromCurrentThread(); } - m_threadPool->waitInPool( this ); + cppu_threadpool::ThreadPool::getInstance()->waitInPool( this ); } } } |