diff options
author | Brad Linden <brad@lindenlab.com> | 2024-05-23 11:31:19 -0700 |
---|---|---|
committer | Brad Linden <brad@lindenlab.com> | 2024-05-23 11:31:19 -0700 |
commit | a1f49564d670a2c41bfa25c833bba2564b9b7f48 (patch) | |
tree | 1d205e51bc37621916a17d459ad83782fe41f975 /indra/llcorehttp/_httpreplyqueue.cpp | |
parent | 6af5db09faf5ea33a2d4c47b64e76f42edae178a (diff) | |
parent | 6377610f6587989c126b00f490dfc8d527a1c2ce (diff) |
Merge remote-tracking branch 'origin/DRTVWR-600-maint-A' into brad/merge-maint-a-to-dev
Diffstat (limited to 'indra/llcorehttp/_httpreplyqueue.cpp')
-rw-r--r-- | indra/llcorehttp/_httpreplyqueue.cpp | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/indra/llcorehttp/_httpreplyqueue.cpp b/indra/llcorehttp/_httpreplyqueue.cpp index 229bfdbe07..6124bb6186 100644 --- a/indra/llcorehttp/_httpreplyqueue.cpp +++ b/indra/llcorehttp/_httpreplyqueue.cpp @@ -51,46 +51,46 @@ HttpReplyQueue::~HttpReplyQueue() void HttpReplyQueue::addOp(const HttpReplyQueue::opPtr_t &op) { - { - HttpScopedLock lock(mQueueMutex); + { + HttpScopedLock lock(mQueueMutex); - mQueue.push_back(op); - } + mQueue.push_back(op); + } } HttpReplyQueue::opPtr_t HttpReplyQueue::fetchOp() { - HttpOperation::ptr_t result; + HttpOperation::ptr_t result; - { - HttpScopedLock lock(mQueueMutex); + { + HttpScopedLock lock(mQueueMutex); - if (mQueue.empty()) + if (mQueue.empty()) return opPtr_t(); - result = mQueue.front(); - mQueue.erase(mQueue.begin()); - } + result = mQueue.front(); + mQueue.erase(mQueue.begin()); + } - // Caller also acquires the reference count - return result; + // Caller also acquires the reference count + return result; } void HttpReplyQueue::fetchAll(OpContainer & ops) { - // Not valid putting something back on the queue... - llassert_always(ops.empty()); + // Not valid putting something back on the queue... + llassert_always(ops.empty()); - { - HttpScopedLock lock(mQueueMutex); + { + HttpScopedLock lock(mQueueMutex); - if (! mQueue.empty()) - { - mQueue.swap(ops); - } - } + if (! mQueue.empty()) + { + mQueue.swap(ops); + } + } } |