diff options
| author |  Craig Tiller <ctiller@google.com> | 2015-07-21 11:45:13 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2015-07-21 11:45:13 -0700 |
| commit | 1c62870cc01583a8adf564580e70b42bfa6a835d (patch) | |
| tree | 4f2638496ed392657499c228b50c4ee98877b446 /src/core | |
| parent | 4e9ce32870b3528032c8ce8beaa6efbdb0ee080f (diff) | |
| parent | 556875d1d0d77c50e0ed8ff9007d42387184fbf8 (diff) | |
Merge github.com:grpc/grpc into sometimes-its-good-just-to-check-in-with-each-other
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/iomgr/tcp_client_posix.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/iomgr/tcp_client_posix.c b/src/core/iomgr/tcp_client_posix.c index 2434de2bd0..ad17ebc733 100644 --- a/src/core/iomgr/tcp_client_posix.c +++ b/src/core/iomgr/tcp_client_posix.c @@ -114,6 +114,8 @@ static void on_writable(void *acp, int success) { void (*cb)(void *arg, grpc_endpoint *tcp) = ac->cb; void *cb_arg = ac->cb_arg; + grpc_alarm_cancel(&ac->alarm); + gpr_mu_lock(&ac->mu); if (success) { do { @@ -178,8 +180,6 @@ finish: if (done) { gpr_mu_destroy(&ac->mu); gpr_free(ac); - } else { - grpc_alarm_cancel(&ac->alarm); } cb(cb_arg, ep); } |