diff options
author | 2016-09-02 15:27:33 +0200 | |
---|---|---|
committer | 2016-09-02 15:27:33 +0200 | |
commit | e44902ecc94a75649b1294ddea77668a87b603a2 (patch) | |
tree | 0a0f01288cfb83ad82d831cfffcdb2eed4fe1812 /src/cpp | |
parent | d3dee724370937503ebe05b9507c90feab2df602 (diff) | |
parent | 79620aaa1052fd02539a36caa63cbe24a2087b0f (diff) |
Merge branch 'master' of github.com:grpc/grpc into codegen_cleanse
Diffstat (limited to 'src/cpp')
-rw-r--r-- | src/cpp/server/server_builder.cc | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/cpp/server/server_builder.cc b/src/cpp/server/server_builder.cc index 87a526fe98..1a014da3b8 100644 --- a/src/cpp/server/server_builder.cc +++ b/src/cpp/server/server_builder.cc @@ -153,14 +153,12 @@ std::unique_ptr<Server> ServerBuilder::BuildAndStart() { (*option)->UpdateArguments(&args); (*option)->UpdatePlugins(&plugins_); } - if (!thread_pool) { - for (auto plugin = plugins_.begin(); plugin != plugins_.end(); plugin++) { - if ((*plugin)->has_sync_methods()) { - thread_pool.reset(CreateDefaultThreadPool()); - has_sync_methods = true; - break; - } + for (auto plugin = plugins_.begin(); plugin != plugins_.end(); plugin++) { + if (!thread_pool && (*plugin)->has_sync_methods()) { + thread_pool.reset(CreateDefaultThreadPool()); + has_sync_methods = true; } + (*plugin)->UpdateChannelArguments(&args); } if (max_message_size_ > 0) { args.SetInt(GRPC_ARG_MAX_MESSAGE_LENGTH, max_message_size_); |