diff options
| author | Anchor Linden <anchor@lindenlab.com> | 2018-09-17 10:50:08 -0700 |
|---|---|---|
| committer | Anchor Linden <anchor@lindenlab.com> | 2018-09-17 10:50:08 -0700 |
| commit | e5aeaa659a453674ef898cdd2ad6183d5eb77e41 (patch) | |
| tree | 2c7196f2f80d11b6f6d660c5852299646f2d449a /indra/llcorehttp/_httpservice.cpp | |
| parent | 7318bd61f7a7ea89e471a6e0f3cc310786a3b41c (diff) | |
| parent | 6f54add8a8852c8f3df86abebe38ef0ce4a6742c (diff) | |
Merge
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(); } } } |