commit 12352b2c5c4f1876586fec8148d4b2405d0c7e36
author Craig Tiller <ctiller@google.com> Tue Jan 10 15:16:14 2017 -0800
committer Craig Tiller <ctiller@google.com> Wed Mar 08 09:08:22 2017 -0800
tree ee74648399c2d4a073dcd0b5a6a83790f43804d4
parent 4751c28b0b371eaa6fd17583e06e740989b62b86

Add test of server builder, including channel args

src/cpp/server/server_builder.cc

diff --git a/src/cpp/server/server_builder.cc b/src/cpp/server/server_builder.cc
index 00a90bb..4eb4b5a 100644
--- a/src/cpp/server/server_builder.cc
+++ b/src/cpp/server/server_builder.cc
@@ -323,9 +323,14 @@
     }
   }
 
+  bool added_port = false;
   for (auto port = ports_.begin(); port != ports_.end(); port++) {
     int r = server->AddListeningPort(port->addr, port->creds.get());
-    if (!r) return nullptr;
+    if (!r) {
+      if (added_port) server->Shutdown();
+      return nullptr;
+    }
+    added_port = true;
     if (port->selected_port != nullptr) {
       *port->selected_port = r;
     }
@@ -333,6 +338,7 @@
 
   auto cqs_data = cqs_.empty() ? nullptr : &cqs_[0];
   if (!server->Start(cqs_data, cqs_.size())) {
+    if (added_port) server->Shutdown();
     return nullptr;
   }