Repository: geode-native Updated Branches: refs/heads/feature/GEODE-3143 [created] 791bb113f
Close socket before deleting it. Project: http://git-wip-us.apache.org/repos/asf/geode-native/repo Commit: http://git-wip-us.apache.org/repos/asf/geode-native/commit/5554c8a3 Tree: http://git-wip-us.apache.org/repos/asf/geode-native/tree/5554c8a3 Diff: http://git-wip-us.apache.org/repos/asf/geode-native/diff/5554c8a3 Branch: refs/heads/feature/GEODE-3143 Commit: 5554c8a37cdcea874ba823e134f9b5bb586c3fba Parents: 338428a Author: fdaniel7 <[email protected]> Authored: Wed Jun 28 10:33:14 2017 +0300 Committer: fdaniel7 <[email protected]> Committed: Wed Jun 28 10:33:14 2017 +0300 ---------------------------------------------------------------------- .gitignore | 17 +++++++++++++++++ src/cppcache/src/TcpConn.cpp | 2 +- 2 files changed, 18 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/geode-native/blob/5554c8a3/.gitignore ---------------------------------------------------------------------- diff --git a/.gitignore b/.gitignore index 9943eda..cc64c0a 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,20 @@ /.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/5554c8a3/src/cppcache/src/TcpConn.cpp ---------------------------------------------------------------------- diff --git a/src/cppcache/src/TcpConn.cpp b/src/cppcache/src/TcpConn.cpp index 3c3747d..f3f38e9 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 - GF_SAFE_DELETE(m_io); + close(); throw TimeoutException(msg); } ACE_OS::snprintf(msg, 256, "TcpConn::connect failed with errno: %d: %s",
