Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(202)

Unified Diff: remoting/protocol/jingle_session.cc

Issue 594743002: Fix side-effect in DCHECK that breaks another DCHECK in JingleSession. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | remoting/protocol/jingle_session_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/protocol/jingle_session.cc
diff --git a/remoting/protocol/jingle_session.cc b/remoting/protocol/jingle_session.cc
index 33938c6f53801306548c0d6f3372091cceda40c6..1778d39d86e64bbab9f9e0d0ea1e4bedf2feefda 100644
--- a/remoting/protocol/jingle_session.cc
+++ b/remoting/protocol/jingle_session.cc
@@ -85,7 +85,6 @@ JingleSession::~JingleSession() {
STLDeleteContainerPointers(transport_info_requests_.begin(),
transport_info_requests_.end());
- channel_multiplexer_.reset();
DCHECK(channels_.empty());
session_manager_->SessionDestroyed(this);
@@ -274,7 +273,7 @@ void JingleSession::CancelChannelCreation(const std::string& name) {
if (it != channels_.end()) {
DCHECK(!it->second->is_connected());
delete it->second;
- DCHECK(!channels_[name]);
+ DCHECK(channels_.find(name) == channels_.end());
}
}
« no previous file with comments | « no previous file | remoting/protocol/jingle_session_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698