diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2018-08-02 21:54:09 +0100 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2018-08-02 21:54:09 +0100 |
| commit | 6ce09ad712f98fe5d0097f1de6a5d1793f5f2bdd (patch) | |
| tree | 0d4ca8e3d55647d713447b0d865c75565e6458cf /indra/llcorehttp/_httpservice.cpp | |
| parent | ac889b1eeb7f9a00e7a6d1d9ba14c70d0c7a33fc (diff) | |
| parent | 09f97172bb478a2c977d8b7b0958196e7e98c433 (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(); } } } |