geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From echobr...@apache.org
Subject [04/10] geode-native git commit: Revert "Close ACE_SOCK_Stream before deleting it"
Date Wed, 28 Jun 2017 15:15:44 GMT
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 <fdaniel@amdocs.com>
Authored: Wed Jun 28 11:08:29 2017 +0300
Committer: fdaniel7 <fdaniel@amdocs.com>
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);


Mime
View raw message