geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From echobr...@apache.org
Subject [05/10] geode-native git commit: Close ACE_SOCK_Stream before deleting it
Date Wed, 28 Jun 2017 15:15:45 GMT
Close ACE_SOCK_Stream before deleting it

GF_SAFE_DELETE will delete the ACE_SOCK_Stream object but the socket
will still be open.


Project: http://git-wip-us.apache.org/repos/asf/geode-native/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode-native/commit/9ca823f8
Tree: http://git-wip-us.apache.org/repos/asf/geode-native/tree/9ca823f8
Diff: http://git-wip-us.apache.org/repos/asf/geode-native/diff/9ca823f8

Branch: refs/heads/feature/GEODE-3143
Commit: 9ca823f889c53d5603d3e3ecf866a8fe085fc012
Parents: 0b31ccc
Author: fdaniel7 <fdaniel@amdocs.com>
Authored: Wed Jun 28 11:10:34 2017 +0300
Committer: fdaniel7 <fdaniel@amdocs.com>
Committed: Wed Jun 28 11:10:34 2017 +0300

----------------------------------------------------------------------
 .gitignore                   | 8 ++++++++
 src/cppcache/src/TcpConn.cpp | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/geode-native/blob/9ca823f8/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 9943eda..593afa1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,11 @@
 /.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/9ca823f8/src/cppcache/src/TcpConn.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/TcpConn.cpp b/src/cppcache/src/TcpConn.cpp
index 3c3747d..b80aa51 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
-    GF_SAFE_DELETE(m_io);
+	close();
     throw GeodeIOException(msg);
   }
   int rc = this->m_io->enable(ACE_NONBLOCK);


Mime
View raw message