You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by ec...@apache.org on 2017/06/28 15:15:46 UTC
[06/10] geode-native git commit: Revert "Close ACE_SOCK_Stream before
deleting it"
Revert "Close ACE_SOCK_Stream before deleting it"
This reverts commit 9ca823f889c53d5603d3e3ecf866a8fe085fc012.
Project: http://git-wip-us.apache.org/repos/asf/geode-native/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode-native/commit/4fe58136
Tree: http://git-wip-us.apache.org/repos/asf/geode-native/tree/4fe58136
Diff: http://git-wip-us.apache.org/repos/asf/geode-native/diff/4fe58136
Branch: refs/heads/feature/GEODE-3143
Commit: 4fe58136309737f2d3ca8a17b1c3e7c21a04a0a6
Parents: 9ca823f
Author: fdaniel7 <fd...@amdocs.com>
Authored: Wed Jun 28 11:11:58 2017 +0300
Committer: fdaniel7 <fd...@amdocs.com>
Committed: Wed Jun 28 11:11:58 2017 +0300
----------------------------------------------------------------------
.gitignore | 8 --------
src/cppcache/src/TcpConn.cpp | 2 +-
2 files changed, 1 insertion(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode-native/blob/4fe58136/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 593afa1..9943eda 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,11 +4,3 @@
/.settings/
/.cproject
/.project
-.vs/config/applicationhost.config
-src/CMakeSettings.json
-.vs/slnx.sqlite
-*.json
-.vs/geode-native2/v15/Browse.VC.opendb
-*.db
-.vs/geode-native2/v15/.suo
-.vs/geode-native2/v15/ipch/AutoPCH/1f9ac4ce/GEODE_BASE-2ee16599/GEODE_BASE.ipch
http://git-wip-us.apache.org/repos/asf/geode-native/blob/4fe58136/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);