diff options
| author |  Craig Tiller <ctiller@google.com> | 2015-09-16 10:04:36 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2015-09-16 10:04:36 -0700 |
| commit | 36c86e2a8348a69dcddff4ce8dbfbaf155423234 (patch) | |
| tree | 51cdaefd8d88efd598bf1382b40cf6c54b0b20a7 /src/core/iomgr/fd_posix.c | |
| parent | 7d57ba138fc4dbde885c5a59231ae6de6968e557 (diff) | |
| parent | 9ed4be48955e3b65b0540f70060b7191d8c1eef1 (diff) | |
Merge github.com:grpc/grpc into shindig
Diffstat (limited to 'src/core/iomgr/fd_posix.c')
| -rw-r--r-- | src/core/iomgr/fd_posix.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/core/iomgr/fd_posix.c b/src/core/iomgr/fd_posix.c index 4bca9f3f6e..69518597d5 100644 --- a/src/core/iomgr/fd_posix.c +++ b/src/core/iomgr/fd_posix.c @@ -222,10 +222,9 @@ void grpc_fd_orphan(grpc_fd *fd, grpc_iomgr_closure *on_done, const char *reason) { fd->on_done_closure = on_done; shutdown(fd->fd, SHUT_RDWR); - REF_BY(fd, 1, reason); /* remove active status, but keep referenced */ gpr_mu_lock(&fd->watcher_mu); + REF_BY(fd, 1, reason); /* remove active status, but keep referenced */ if (!has_watchers(fd)) { - GPR_ASSERT(!fd->closed); fd->closed = 1; close(fd->fd); if (fd->on_done_closure) { |