aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKarol Matuszkiewicz <kmatuszkiewicz@affinegy.com>2017-08-16 06:24:57 +0000
committerGerrit Code Review <gerrit@172.30.200.193>2017-08-16 06:24:57 +0000
commit62570116b3d6b3c4fd5fddd6069cf12e899e6880 (patch)
tree4fba77c63c369bcf6a96755e89bbccd41235a18d
parent6c44615bb45b8567e041cef5ed89e0527beb585e (diff)
parentf11a6a9f7659710a491bde245d5d5c9cc8582df0 (diff)
Merge "ASACORE-3065 UDPTransport: PushBytes acquires the same lock twice"
-rw-r--r--alljoyn_core/router/UDPTransport.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/alljoyn_core/router/UDPTransport.cc b/alljoyn_core/router/UDPTransport.cc
index 34cfe6a..a17402f 100644
--- a/alljoyn_core/router/UDPTransport.cc
+++ b/alljoyn_core/router/UDPTransport.cc
@@ -2655,12 +2655,11 @@ class ArdpStream : public qcc::Stream {
* the reference to it.
*/
numSent = numBytes;
- m_transport->m_cbLock.Lock(MUTEX_CONTEXT);
++m_sendsOutstanding;
+ m_transport->m_cbLock.AssertOwnedByCurrentThread();
#if SENT_SANITY
m_sentSet.insert(buffer);
#endif
- m_transport->m_cbLock.Unlock(MUTEX_CONTEXT);
buffer = NULL;
done = true;
continue;