Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 7E4CD200BD4 for ; Thu, 1 Dec 2016 21:16:38 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 7CE93160B0B; Thu, 1 Dec 2016 20:16:38 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id C5CDF160B05 for ; Thu, 1 Dec 2016 21:16:37 +0100 (CET) Received: (qmail 93730 invoked by uid 500); 1 Dec 2016 20:16:37 -0000 Mailing-List: contact commits-help@qpid.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@qpid.apache.org Delivered-To: mailing list commits@qpid.apache.org Received: (qmail 93721 invoked by uid 99); 1 Dec 2016 20:16:36 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 01 Dec 2016 20:16:36 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id C8300E09CD; Thu, 1 Dec 2016 20:16:36 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: cliffjansen@apache.org To: commits@qpid.apache.org Message-Id: <3b3ce095f4de4017ae7576e4390d7a0a@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: qpid-proton git commit: PROTON-1336: make reactor teardown sequence work with Windows io objects Date: Thu, 1 Dec 2016 20:16:36 +0000 (UTC) archived-at: Thu, 01 Dec 2016 20:16:38 -0000 Repository: qpid-proton Updated Branches: refs/heads/master b47ebb7e4 -> 9adbca281 PROTON-1336: make reactor teardown sequence work with Windows io objects Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/9adbca28 Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/9adbca28 Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/9adbca28 Branch: refs/heads/master Commit: 9adbca2818a0aaf860f7d0854e6267d08117a2b1 Parents: b47ebb7 Author: Clifford Jansen Authored: Thu Dec 1 12:10:22 2016 -0800 Committer: Clifford Jansen Committed: Thu Dec 1 12:10:22 2016 -0800 ---------------------------------------------------------------------- proton-c/src/reactor/io/windows/io.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/9adbca28/proton-c/src/reactor/io/windows/io.c ---------------------------------------------------------------------- diff --git a/proton-c/src/reactor/io/windows/io.c b/proton-c/src/reactor/io/windows/io.c index 3ae6722..07692d1 100644 --- a/proton-c/src/reactor/io/windows/io.c +++ b/proton-c/src/reactor/io/windows/io.c @@ -92,8 +92,11 @@ void pn_io_initialize(void *obj) void pn_io_finalize(void *obj) { pn_io_t *io = (pn_io_t *) obj; - pn_error_free(io->error); + pn_selector_t *sel = io->iocp->selector; pn_free(io->iocp); + if (sel) + pn_decref(sel); + pn_error_free(io->error); WSACleanup(); } @@ -368,8 +371,10 @@ bool pn_wouldblock(pn_io_t *io) pn_selector_t *pn_io_selector(pn_io_t *io) { - if (io->iocp->selector == NULL) + if (io->iocp->selector == NULL) { io->iocp->selector = pni_selector_create(io->iocp); + pn_incref(io->iocp->selector); + } return io->iocp->selector; } --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org For additional commands, e-mail: commits-help@qpid.apache.org