diff options
| author | Andrew A. de Laix <alain@lindenlab.com> | 2010-11-11 11:46:24 -0800 |
|---|---|---|
| committer | Andrew A. de Laix <alain@lindenlab.com> | 2010-11-11 11:46:24 -0800 |
| commit | 7a7f89db6d9c5e6b2c6c89ea39c0302907a0442b (patch) | |
| tree | f9f962b47c1e6c3fa32c40dec4e9e804e49614cb /indra/llcommon/llthreadsafequeue.cpp | |
| parent | 4e22d63352dd65085cfbba9c22070271ecdd4bcf (diff) | |
fix termination issues with thread safe queue in main loop repeater service.
Diffstat (limited to 'indra/llcommon/llthreadsafequeue.cpp')
| -rw-r--r-- | indra/llcommon/llthreadsafequeue.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/llcommon/llthreadsafequeue.cpp b/indra/llcommon/llthreadsafequeue.cpp index a7141605ef..8a73e632a9 100644 --- a/indra/llcommon/llthreadsafequeue.cpp +++ b/indra/llcommon/llthreadsafequeue.cpp @@ -53,13 +53,13 @@ LLThreadSafeQueueImplementation::LLThreadSafeQueueImplementation(apr_pool_t * po LLThreadSafeQueueImplementation::~LLThreadSafeQueueImplementation() { - if(mOwnsPool && (mPool != 0)) apr_pool_destroy(mPool); if(mQueue != 0) { if(apr_queue_size(mQueue) != 0) llwarns << - "terminating queue which still contains elements;" << - "memory will be leaked" << LL_ENDL; + "terminating queue which still contains " << apr_queue_size(mQueue) << + " elements;" << "memory will be leaked" << LL_ENDL; apr_queue_term(mQueue); } + if(mOwnsPool && (mPool != 0)) apr_pool_destroy(mPool); } |