Revert "Close socket before deleting it." This reverts commit 5554c8a37cdcea874ba823e134f9b5bb586c3fba.
Project: http://git-wip-us.apache.org/repos/asf/geode-native/repo Commit: http://git-wip-us.apache.org/repos/asf/geode-native/commit/25255eb3 Tree: http://git-wip-us.apache.org/repos/asf/geode-native/tree/25255eb3 Diff: http://git-wip-us.apache.org/repos/asf/geode-native/diff/25255eb3 Branch: refs/heads/feature/GEODE-3143 Commit: 25255eb3ab8afc161f26dd35ed96bd46b1805505 Parents: 5554c8a Author: fdaniel7 <fdan...@amdocs.com> Authored: Wed Jun 28 11:00:29 2017 +0300 Committer: fdaniel7 <fdan...@amdocs.com> Committed: Wed Jun 28 11:00:29 2017 +0300 ---------------------------------------------------------------------- .gitignore | 17 ----------------- src/cppcache/src/TcpConn.cpp | 2 +- 2 files changed, 1 insertion(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/geode-native/blob/25255eb3/.gitignore ---------------------------------------------------------------------- diff --git a/.gitignore b/.gitignore index cc64c0a..9943eda 100644 --- a/.gitignore +++ b/.gitignore @@ -4,20 +4,3 @@ /.settings/ /.cproject /.project -/.vs -/src/CMakeSettings.json -/.vs/config/applicationhost.config -/.vs/slnx.sqlite -/.vs/ProjectSettings.json -/.vs/geode-native2/v15/ipch/AutoPCH/e98f8220/GEODE_BASE-2ee16599/GEODE_BASE.ipch -/.vs/geode-native2/v15/ipch/AutoPCH/e98f8220/GEODE_BASE-2ee16599 -/.vs/geode-native2/v15/ipch/AutoPCH/e98f8220/FWKBBSERVER-8b7fc38f/FWKBBSERVER.ipch -/.vs/geode-native2/v15/ipch/AutoPCH/e98f8220/FWKBBSERVER-8b7fc38f -/.vs/geode-native2/v15/ipch/AutoPCH/e98f8220 -/.vs/geode-native2/v15/Browse.VC.opendb -/.vs/geode-native2/v15/Browse.VC.db -/.vs/geode-native2/v15/.suo -/.vs/geode-native2/v15 -/.vs/config/applicationhost.config -/.vs/config -/.vs http://git-wip-us.apache.org/repos/asf/geode-native/blob/25255eb3/src/cppcache/src/TcpConn.cpp ---------------------------------------------------------------------- diff --git a/src/cppcache/src/TcpConn.cpp b/src/cppcache/src/TcpConn.cpp index f3f38e9..3c3747d 100644 --- a/src/cppcache/src/TcpConn.cpp +++ b/src/cppcache/src/TcpConn.cpp @@ -263,7 +263,7 @@ void TcpConn::connect() { "TcpConn::connect Attempt to connect timed out after %d seconds.", waitSeconds); // this is only called by constructor, so we must delete m_io - close(); + GF_SAFE_DELETE(m_io); throw TimeoutException(msg); } ACE_OS::snprintf(msg, 256, "TcpConn::connect failed with errno: %d: %s",
