Index: mojo/public/cpp/bindings/lib/connector.cc |
diff --git a/mojo/public/cpp/bindings/lib/connector.cc b/mojo/public/cpp/bindings/lib/connector.cc |
index 6665ff9442a1d078d3554358215ff5a4c424cb4f..74462b63ae96003bcd02f6cb6a965c1baf203182 100644 |
--- a/mojo/public/cpp/bindings/lib/connector.cc |
+++ b/mojo/public/cpp/bindings/lib/connector.cc |
@@ -198,11 +198,7 @@ void Connector::CancelWait() { |
void Connector::NotifyError() { |
error_ = true; |
- // The error handler might destroyed |this|. Also, after an error, all method |
- // should end early. |
- if (destroyed_flag_) { |
- *destroyed_flag_ = true; // Propagate flag. |
darin (slow to review)
2014/08/21 23:47:26
The "Propagate flag" comment makes me wonder if th
|
- } |
+ CancelWait(); |
qsr
2014/08/22 08:28:59
What is the code path where we can be waiting? Fro
sky
2014/08/22 15:06:00
WaitForIncomingMessage is public and can be invoke
viettrungluu
2014/08/22 15:30:57
Do we have a test for this case?
darin (slow to review)
2014/08/22 16:11:27
Would probably be good to add a comment explaining
|
if (error_handler_) |
error_handler_->OnConnectionError(); |
qsr
2014/08/22 08:28:59
I think we need to handle the case where the error
sky
2014/08/22 15:06:00
Unless I'm missing something, that's fine. The des
qsr
2014/08/22 15:21:25
Sorry about this. You are right.
|
} |