diff options
| author |  Craig Tiller <ctiller@google.com> | 2016-05-06 21:03:29 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2016-05-06 21:03:29 -0700 |
| commit | 94f8453d0a58d2ab20c3bbe7f687089dbdcb84af (patch) | |
| tree | e30dd92e0b95533781e834959b3f8631539cfda1 /src/core/ext | |
| parent | 4f1d0f337b15748d171ec21dddba1f6d80e94778 (diff) | |
Bug fixes to error handling
Diffstat (limited to 'src/core/ext')
| -rw-r--r-- | src/core/ext/client_config/client_channel.c | 4 | ||||
| -rw-r--r-- | src/core/ext/client_config/subchannel.c | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/core/ext/client_config/client_channel.c b/src/core/ext/client_config/client_channel.c index 801cbe0702..eaefa3be6d 100644 --- a/src/core/ext/client_config/client_channel.c +++ b/src/core/ext/client_config/client_channel.c @@ -128,8 +128,8 @@ static void set_channel_connectivity_state_locked(grpc_exec_ctx *exec_ctx, /* mask= */ GRPC_INITIAL_METADATA_IGNORE_CONNECTIVITY, /* check= */ 0); } - grpc_connectivity_state_set(exec_ctx, &chand->state_tracker, state, error, - reason); + grpc_connectivity_state_set(exec_ctx, &chand->state_tracker, state, + GRPC_ERROR_REF(error), reason); } static void on_lb_policy_state_changed_locked(grpc_exec_ctx *exec_ctx, diff --git a/src/core/ext/client_config/subchannel.c b/src/core/ext/client_config/subchannel.c index 0f58dabb1e..69b1fa5d34 100644 --- a/src/core/ext/client_config/subchannel.c +++ b/src/core/ext/client_config/subchannel.c @@ -484,7 +484,8 @@ static void subchannel_on_child_state_changed(grpc_exec_ctx *exec_ctx, void *p, sw->connectivity_state = GRPC_CHANNEL_FATAL_FAILURE; } grpc_connectivity_state_set(exec_ctx, &c->state_tracker, - sw->connectivity_state, error, "reflect_child"); + sw->connectivity_state, GRPC_ERROR_REF(error), + "reflect_child"); if (sw->connectivity_state != GRPC_CHANNEL_FATAL_FAILURE) { grpc_connected_subchannel_notify_on_state_change( exec_ctx, GET_CONNECTED_SUBCHANNEL(c, no_barrier), NULL, |