diff options
| author |  Craig Tiller <ctiller@google.com> | 2017-02-23 06:52:59 -0800 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2017-02-23 06:52:59 -0800 |
| commit | b96a96ebd508bfc53fd70ebd944f0b92f62387f8 (patch) | |
| tree | f5243ba1d6e9c62ef794544158b886cd75bdc533 /test/core/end2end | |
| parent | 4374fd3a908cd811ac51d9f71ca093cb64604096 (diff) | |
| parent | 4bab9463c3edf29b28d66fb0ddf32a4a348af5d1 (diff) | |
Merge pull request #9662 from ctiller/c3+r
Bring resolvers under the client channel combiner lock
Diffstat (limited to 'test/core/end2end')
| -rw-r--r-- | test/core/end2end/fake_resolver.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/core/end2end/fake_resolver.c b/test/core/end2end/fake_resolver.c index 4f05f69f01..8a37531449 100644 --- a/test/core/end2end/fake_resolver.c +++ b/test/core/end2end/fake_resolver.c @@ -213,7 +213,7 @@ static grpc_resolver* fake_resolver_create(grpc_exec_ctx* exec_ctx, r->channel_args = grpc_channel_args_copy(args->args); r->addresses = addresses; gpr_mu_init(&r->mu); - grpc_resolver_init(&r->base, &fake_resolver_vtable); + grpc_resolver_init(&r->base, &fake_resolver_vtable, args->combiner); return &r->base; } |