diff options
| author |  Mark D. Roth <roth@google.com> | 2017-04-17 09:49:56 -0700 |
|---|---|---|
| committer | Mark D. Roth <roth@google.com> | 2017-04-17 09:49:56 -0700 |
| commit | d9bc60c87e68e3a828cdad3774b22caf3acbb2b9 (patch) | |
| tree | be1bac0f32776349be8e0d9d58d3091291a0860a /src/core/lib/channel/handshaker.c | |
| parent | e3ec4b2c287b480d61ddaa2b461cf6d468519313 (diff) | |
| parent | c5fc2b7112e29c1cc57b335b3611877a297417b2 (diff) | |
Merge remote-tracking branch 'upstream/master' into service_config_lb_semantics
Diffstat (limited to 'src/core/lib/channel/handshaker.c')
| -rw-r--r-- | src/core/lib/channel/handshaker.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/core/lib/channel/handshaker.c b/src/core/lib/channel/handshaker.c index 1b4240bb10..5861fa6f54 100644 --- a/src/core/lib/channel/handshaker.c +++ b/src/core/lib/channel/handshaker.c @@ -236,8 +236,9 @@ static void call_next_handshaker(grpc_exec_ctx* exec_ctx, void* arg, static void on_timeout(grpc_exec_ctx* exec_ctx, void* arg, grpc_error* error) { grpc_handshake_manager* mgr = arg; if (error == GRPC_ERROR_NONE) { // Timer fired, rather than being cancelled. - grpc_handshake_manager_shutdown(exec_ctx, mgr, - GRPC_ERROR_CREATE("Handshake timed out")); + grpc_handshake_manager_shutdown( + exec_ctx, mgr, + GRPC_ERROR_CREATE_FROM_STATIC_STRING("Handshake timed out")); } grpc_handshake_manager_unref(exec_ctx, mgr); } |