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 2B345200CC4 for ; Wed, 28 Jun 2017 17:15:44 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 29D4A160BFA; Wed, 28 Jun 2017 15:15:44 +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 46212160BF7 for ; Wed, 28 Jun 2017 17:15:43 +0200 (CEST) Received: (qmail 15162 invoked by uid 500); 28 Jun 2017 15:15:42 -0000 Mailing-List: contact commits-help@geode.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@geode.apache.org Delivered-To: mailing list commits@geode.apache.org Received: (qmail 15005 invoked by uid 99); 28 Jun 2017 15:15:42 -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; Wed, 28 Jun 2017 15:15:42 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 90F68E96AC; Wed, 28 Jun 2017 15:15:41 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: echobravo@apache.org To: commits@geode.apache.org Date: Wed, 28 Jun 2017 15:15:44 -0000 Message-Id: <74df4ebc5ffa459a973318a1b69d31b2@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [04/10] geode-native git commit: Revert "Close ACE_SOCK_Stream before deleting it" archived-at: Wed, 28 Jun 2017 15:15:44 -0000 Revert "Close ACE_SOCK_Stream before deleting it" This reverts commit 1896744d6f6d0fa25ca62b8b9b060c28398e1f02. Project: http://git-wip-us.apache.org/repos/asf/geode-native/repo Commit: http://git-wip-us.apache.org/repos/asf/geode-native/commit/0b31ccc1 Tree: http://git-wip-us.apache.org/repos/asf/geode-native/tree/0b31ccc1 Diff: http://git-wip-us.apache.org/repos/asf/geode-native/diff/0b31ccc1 Branch: refs/heads/feature/GEODE-3143 Commit: 0b31ccc12382ed4cd365c77f4dc89437abf3449b Parents: 1896744 Author: fdaniel7 Authored: Wed Jun 28 11:08:29 2017 +0300 Committer: fdaniel7 Committed: Wed Jun 28 11:08:29 2017 +0300 ---------------------------------------------------------------------- .../1f9ac4ce/GEODE_BASE-2ee16599/GEODE_BASE.ipch | Bin 327680 -> 0 bytes src/cppcache/src/TcpConn.cpp | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/geode-native/blob/0b31ccc1/.vs/geode-native2/v15/ipch/AutoPCH/1f9ac4ce/GEODE_BASE-2ee16599/GEODE_BASE.ipch ---------------------------------------------------------------------- diff --git a/.vs/geode-native2/v15/ipch/AutoPCH/1f9ac4ce/GEODE_BASE-2ee16599/GEODE_BASE.ipch b/.vs/geode-native2/v15/ipch/AutoPCH/1f9ac4ce/GEODE_BASE-2ee16599/GEODE_BASE.ipch deleted file mode 100644 index 8671421..0000000 Binary files a/.vs/geode-native2/v15/ipch/AutoPCH/1f9ac4ce/GEODE_BASE-2ee16599/GEODE_BASE.ipch and /dev/null differ http://git-wip-us.apache.org/repos/asf/geode-native/blob/0b31ccc1/src/cppcache/src/TcpConn.cpp ---------------------------------------------------------------------- diff --git a/src/cppcache/src/TcpConn.cpp b/src/cppcache/src/TcpConn.cpp index b80aa51..3c3747d 100644 --- a/src/cppcache/src/TcpConn.cpp +++ b/src/cppcache/src/TcpConn.cpp @@ -269,7 +269,7 @@ void TcpConn::connect() { ACE_OS::snprintf(msg, 256, "TcpConn::connect failed with errno: %d: %s", lastError, ACE_OS::strerror(lastError)); // this is only called by constructor, so we must delete m_io - close(); + GF_SAFE_DELETE(m_io); throw GeodeIOException(msg); } int rc = this->m_io->enable(ACE_NONBLOCK);