diff options
| author | Alex Vakulenko <avakulenko@google.com> | 2016-03-23 20:52:24 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-03-23 20:52:24 +0000 |
| commit | 88d89453cac2385c1688bbb30dcd00c93bc4defc (patch) | |
| tree | 7b8aa08621146b81ff42c7beede9e95a32cc7aad | |
| parent | 240da60218315e320d7414384a7d0b35b7a1b708 (diff) | |
| parent | 6a269a316d9f146d2f1381e816bda6284b23ebc4 (diff) | |
| download | weaved-88d89453cac2385c1688bbb30dcd00c93bc4defc.tar.gz | |
weaved: Fix OnProtocolHandlerConnected notification
am: 6a269a3
* commit '6a269a316d9f146d2f1381e816bda6284b23ebc4':
weaved: Fix OnProtocolHandlerConnected notification
| -rw-r--r-- | buffet/webserv_client.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/buffet/webserv_client.cc b/buffet/webserv_client.cc index 030ae59..5b35c8b 100644 --- a/buffet/webserv_client.cc +++ b/buffet/webserv_client.cc @@ -149,14 +149,17 @@ void WebServClient::OnRequest(const RequestHandlerCallback& callback, void WebServClient::OnProtocolHandlerConnected( libwebserv::ProtocolHandler* protocol_handler) { + bool connected = false; if (protocol_handler->GetName() == libwebserv::ProtocolHandler::kHttp) { http_port_ = *protocol_handler->GetPorts().begin(); + connected = true; } else if (protocol_handler->GetName() == libwebserv::ProtocolHandler::kHttps) { https_port_ = *protocol_handler->GetPorts().begin(); certificate_ = protocol_handler->GetCertificateFingerprint(); + connected = true; } - if (https_port_ && https_port_) + if (connected && http_port_ && https_port_) server_available_callback_.Run(); } |