diff options
author | 2016-06-04 18:03:42 -0700 | |
---|---|---|
committer | 2016-06-04 18:03:42 -0700 | |
commit | bfc7ed66286a77ed4dca0ec1feb23912b2ec1f02 (patch) | |
tree | d731e555910b79b4694b311b1faed78783f688b8 /src/core/lib/transport/connectivity_state.c | |
parent | c49464de3ed6108956561128b006c78777bd6db7 (diff) | |
parent | 845a0567e344d2d85ece37471e63199c045c2249 (diff) |
Merge branch 'master' into fix_3803
Diffstat (limited to 'src/core/lib/transport/connectivity_state.c')
-rw-r--r-- | src/core/lib/transport/connectivity_state.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/core/lib/transport/connectivity_state.c b/src/core/lib/transport/connectivity_state.c index e24ee638fd..74a5ef5c13 100644 --- a/src/core/lib/transport/connectivity_state.c +++ b/src/core/lib/transport/connectivity_state.c @@ -51,7 +51,7 @@ const char *grpc_connectivity_state_name(grpc_connectivity_state state) { return "READY"; case GRPC_CHANNEL_TRANSIENT_FAILURE: return "TRANSIENT_FAILURE"; - case GRPC_CHANNEL_FATAL_FAILURE: + case GRPC_CHANNEL_SHUTDOWN: return "FATAL_FAILURE"; } GPR_UNREACHABLE_CODE(return "UNKNOWN"); @@ -72,8 +72,8 @@ void grpc_connectivity_state_destroy(grpc_exec_ctx *exec_ctx, while ((w = tracker->watchers)) { tracker->watchers = w->next; - if (GRPC_CHANNEL_FATAL_FAILURE != *w->current) { - *w->current = GRPC_CHANNEL_FATAL_FAILURE; + if (GRPC_CHANNEL_SHUTDOWN != *w->current) { + *w->current = GRPC_CHANNEL_SHUTDOWN; success = 1; } else { success = 0; @@ -153,7 +153,7 @@ void grpc_connectivity_state_set(grpc_exec_ctx *exec_ctx, if (tracker->current_state == state) { return; } - GPR_ASSERT(tracker->current_state != GRPC_CHANNEL_FATAL_FAILURE); + GPR_ASSERT(tracker->current_state != GRPC_CHANNEL_SHUTDOWN); tracker->current_state = state; while ((w = tracker->watchers) != NULL) { *w->current = tracker->current_state; |