diff options
| author | Oz Linden <oz@lindenlab.com> | 2018-08-02 16:36:50 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2018-08-02 16:36:50 -0400 |
| commit | 5e8995220304a105d821eb3bccd8be484520174a (patch) | |
| tree | 9b4ba9044ba7f98a38865fc854914e6b9e248486 /indra/llcorehttp/_httpservice.cpp | |
| parent | c339894390af70b32cef3fca258b9a19ce4aeb20 (diff) | |
| parent | 09f97172bb478a2c977d8b7b0958196e7e98c433 (diff) | |
merge changes for 5.1.7-release
Diffstat (limited to 'indra/llcorehttp/_httpservice.cpp')
| -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(); } } } |