Merge pull request #18489 from markdroth/c++_client_channel_channel_data

Convert client_channel channel_data to C++
6 years ago · acfe2a0b16
parent 54f8cdd1fd 38220243b0
commit acfe2a0b16
2 changed files with 580 additions and 490 deletions
--- a/src/core/ext/filters/client_channel/client_channel.cc
+++ b/src/core/ext/filters/client_channel/client_channel.cc
--- a/src/core/ext/filters/client_channel/client_channel_channelz.cc
+++ b/src/core/ext/filters/client_channel/client_channel_channelz.cc
@ -49,8 +49,8 @@ ClientChannelNode::ClientChannelNode(grpc_channel* channel,
    : ChannelNode(channel, channel_tracer_max_nodes, is_top_level_channel) {
  client_channel_ =
      grpc_channel_stack_last_element(grpc_channel_get_channel_stack(channel));
-  grpc_client_channel_set_channelz_node(client_channel_, this);
  GPR_ASSERT(client_channel_->filter == &grpc_client_channel_filter);
+  grpc_client_channel_set_channelz_node(client_channel_, this);
 }

 void ClientChannelNode::PopulateConnectivityState(grpc_json* json) {