diff options
| -rw-r--r-- | src/core/ext/filters/client_channel/connector.h | 3 | ||||
| -rw-r--r-- | src/core/lib/surface/server.cc | 4 |
2 files changed, 2 insertions, 5 deletions
diff --git a/src/core/ext/filters/client_channel/connector.h b/src/core/ext/filters/client_channel/connector.h index a5ef9bc255..ea34dcdab5 100644 --- a/src/core/ext/filters/client_channel/connector.h +++ b/src/core/ext/filters/client_channel/connector.h @@ -22,7 +22,6 @@ #include <grpc/support/port_platform.h> #include "src/core/lib/channel/channel_stack.h" -#include "src/core/lib/channel/channelz.h" #include "src/core/lib/iomgr/resolve_address.h" #include "src/core/lib/transport/transport.h" @@ -49,7 +48,7 @@ typedef struct { /** channel arguments (to be passed to the filters) */ grpc_channel_args* channel_args; - /** socket node of the connected transport. 0 if not availible */ + /** socket uuid of the connected transport. 0 if not available */ intptr_t socket_uuid; } grpc_connect_out_args; diff --git a/src/core/lib/surface/server.cc b/src/core/lib/surface/server.cc index e257caa8f9..44e938ad77 100644 --- a/src/core/lib/surface/server.cc +++ b/src/core/lib/surface/server.cc @@ -462,9 +462,7 @@ static void finish_destroy_channel(void* cd, grpc_error* error) { channel_data* chand = static_cast<channel_data*>(cd); grpc_server* server = chand->server; GRPC_CHANNEL_INTERNAL_UNREF(chand->channel, "server"); - if (chand->socket_node != nullptr) { - chand->socket_node->Unref(); - } + chand->socket_node.reset(); server_unref(server); } |