diff options
| author |  Craig Tiller <ctiller@google.com> | 2017-04-14 13:15:56 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2017-04-14 13:15:56 -0700 |
| commit | c3666d70902ff7b9c1735761d7156232e84ef4e4 (patch) | |
| tree | 9ffc8ca7d7f9fac109b49512cf783a75a27244d1 /src/cpp/server/server_builder.cc | |
| parent | 57e6485e2d104a8af1aca76314d188471252761d (diff) | |
| parent | e412a180602753972ac496560322e224a5db987f (diff) | |
Merge github.com:grpc/grpc into hybrid
Diffstat (limited to 'src/cpp/server/server_builder.cc')
| -rw-r--r-- | src/cpp/server/server_builder.cc | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/cpp/server/server_builder.cc b/src/cpp/server/server_builder.cc index a92cec643c..2ead048a1f 100644 --- a/src/cpp/server/server_builder.cc +++ b/src/cpp/server/server_builder.cc @@ -343,10 +343,7 @@ std::unique_ptr<Server> ServerBuilder::BuildAndStart() { } auto cqs_data = cqs_.empty() ? nullptr : &cqs_[0]; - if (!server->Start(cqs_data, cqs_.size())) { - if (added_port) server->Shutdown(); - return nullptr; - } + server->Start(cqs_data, cqs_.size()); for (auto plugin = plugins_.begin(); plugin != plugins_.end(); plugin++) { (*plugin)->Finish(initializer); |