From 54fd70046d671d121a71a27181ea47ad12b27d48 Mon Sep 17 00:00:00 2001 From: "mallinath@webrtc.org" Date: Sat, 19 Apr 2014 01:03:33 +0000 Subject: [PATCH] Remove ASSERT in TransportChannelProxy::SetImplementation, when proxy already set to same transport channel impl. Since session can call SetImplementation multiple times with or without BUNDLE, there are cases when SetImplementation is called with same impl (OnRemoteCandidates/PushdownTransportDescription/SetupMux). Also variables in cricket::TransportProxy like |connecting_| and |negotiated_| are accessed both between worker thread and signaling threads (which calls for bigger change on how session interacts with Transport and TransportChannelProxy). I have a created a separate bug to address later issue. Also if single thread used as worker and signaling thread, we can end up calling SetLocalDescription and OnRemoteCandidates in same call sequence, which will end up calling SetImplementation twice. R=wu@webrtc.org Review URL: https://webrtc-codereview.appspot.com/12019007 git-svn-id: http://webrtc.googlecode.com/svn/trunk@5944 4adac7df-926f-26a2-2b94-8c16560cd09d --- talk/p2p/base/transportchannelproxy.cc | 1 - 1 file changed, 1 deletion(-) diff --git a/talk/p2p/base/transportchannelproxy.cc b/talk/p2p/base/transportchannelproxy.cc index 3c4aeb128..fdcc509d3 100644 --- a/talk/p2p/base/transportchannelproxy.cc +++ b/talk/p2p/base/transportchannelproxy.cc @@ -58,7 +58,6 @@ void TransportChannelProxy::SetImplementation(TransportChannelImpl* impl) { ASSERT(talk_base::Thread::Current() == worker_thread_); if (impl == impl_) { - ASSERT(false); // Ignore if the |impl| has already been set. LOG(LS_WARNING) << "Ignored TransportChannelProxy::SetImplementation call " << "with a same impl as the existing one.";