diff options
| author | Graham Linden <graham@lindenlab.com> | 2018-08-06 18:39:52 +0100 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2018-08-06 18:39:52 +0100 |
| commit | 46c6ead5c3fe87405a644e3167f15b9c6239ee03 (patch) | |
| tree | 4117fbb6dc9aa7bc198e4796fe2c194b4938df3f /indra/llcorehttp | |
| parent | 7da3a1eb4f14b67c698977eb1947ce06a312d507 (diff) | |
| parent | 057d115ac3de49db0e35066975441e64111c8369 (diff) | |
Merge
Diffstat (limited to 'indra/llcorehttp')
| -rw-r--r-- | indra/llcorehttp/_httpservice.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/indra/llcorehttp/_httpservice.cpp b/indra/llcorehttp/_httpservice.cpp index 49d865cbfa..0b72b53186 100644 --- a/indra/llcorehttp/_httpservice.cpp +++ b/indra/llcorehttp/_httpservice.cpp @@ -95,10 +95,12 @@ HttpService::~HttpService() if (! mThread->timedJoin(250)) { // Failed to join, expect problems ahead so do a hard termination. - mThread->cancel(); + LL_WARNS(LOG_CORE) << "Destroying HttpService with running thread. Expect problems." << LL_NEWLINE + << "State: " << S32(sState) + << " Last policy: " << U32(mLastPolicy) + << LL_ENDL; - LL_WARNS(LOG_CORE) << "Destroying HttpService with running thread. Expect problems." - << LL_ENDL; + mThread->cancel(); } } } |