diff options
author | 2016-12-12 06:38:13 -0800 | |
---|---|---|
committer | 2016-12-12 06:38:13 -0800 | |
commit | 1a7c57bf6c939fc3f9a478191f93f997192653f4 (patch) | |
tree | 13662017c302b2d101f1a934e708a79a55b89d08 /src/core/lib/security | |
parent | b995e8bcdabd5e40bf5384a64ee57e83cc9691ff (diff) |
Fix merge error
Diffstat (limited to 'src/core/lib/security')
-rw-r--r-- | src/core/lib/security/transport/security_handshaker.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/core/lib/security/transport/security_handshaker.c b/src/core/lib/security/transport/security_handshaker.c index 4f9f97ed71..7c2f63d1cc 100644 --- a/src/core/lib/security/transport/security_handshaker.c +++ b/src/core/lib/security/transport/security_handshaker.c @@ -132,14 +132,10 @@ static void security_handshake_failed_locked(grpc_exec_ctx *exec_ctx, grpc_endpoint_shutdown(exec_ctx, h->args->endpoint); // Not shutting down, so the write failed. Clean up before // invoking the callback. -<<<<<<< HEAD cleanup_args_for_failure_locked(exec_ctx, h); -======= - cleanup_args_for_failure_locked(h); // Set shutdown to true so that subsequent calls to // security_handshaker_shutdown() do nothing. h->shutdown = true; ->>>>>>> b62bffbea5eef106bfbe644e8af161889c927401 } // Invoke callback. grpc_exec_ctx_sched(exec_ctx, h->on_handshake_done, error, NULL); |