From eac07c3cc8bad2c704931186aa4e23851d30df56 Mon Sep 17 00:00:00 2001
From: Vijay Pai <vpai@google.com>
Date: Fri, 10 Jun 2016 01:36:53 -0700
Subject: [PATCH] WIP
---
src/cpp/server/server_builder.cc | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/cpp/server/server_builder.cc b/src/cpp/server/server_builder.cc
index 243a0563ba..ea5dfbfe8e 100644
--- a/src/cpp/server/server_builder.cc
+++ b/src/cpp/server/server_builder.cc
@@ -54,10 +54,15 @@ ServerBuilder::ServerBuilder()
: max_message_size_(-1), generic_service_(nullptr) {
grpc_compression_options_init(&compression_options_);
gpr_once_init(&once_init_plugin_list, do_plugin_list_init);
- for (auto it = g_plugin_factory_list->begin(); it != g_plugin_factory_list->end(); it++) {
+ for (auto it = g_plugin_factory_list->begin();
+ it != g_plugin_factory_list->end(); it++) {
auto& factory = *it;
std::unique_ptr<ServerBuilderPlugin> plugin = factory();
- plugins_[plugin->name()] = std::move(plugin);
+ auto name = plugin->name();
+ ServerBuilderPlugin* plugin_ptr = plugin.release();
+ plugins_[name] = nullptr;
+ auto pl = plugins_.find(name);
+ pl->second.reset(plugin_ptr);
}
}
--
GitLab