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/05/25 20:05:39 UTC
geode-native git commit: GEODE-2990: fix for testXMLCreationWithPools
test failure
Repository: geode-native
Updated Branches:
refs/heads/develop 7eea00248 -> 6708bf397
GEODE-2990: fix for testXMLCreationWithPools test failure
Project: http://git-wip-us.apache.org/repos/asf/geode-native/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode-native/commit/6708bf39
Tree: http://git-wip-us.apache.org/repos/asf/geode-native/tree/6708bf39
Diff: http://git-wip-us.apache.org/repos/asf/geode-native/diff/6708bf39
Branch: refs/heads/develop
Commit: 6708bf397485714674365c11ca9b0b9b90a8ff0f
Parents: 7eea002
Author: Ernest Burghardt <eb...@pivotal.io>
Authored: Thu May 25 12:04:48 2017 -0700
Committer: Ernest Burghardt <eb...@pivotal.io>
Committed: Thu May 25 12:04:48 2017 -0700
----------------------------------------------------------------------
src/cppcache/src/CacheImpl.cpp | 9 +++------
src/cppcache/src/CacheImpl.hpp | 1 -
2 files changed, 3 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode-native/blob/6708bf39/src/cppcache/src/CacheImpl.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/CacheImpl.cpp b/src/cppcache/src/CacheImpl.cpp
index 40f0cc9..677ccc8 100644
--- a/src/cppcache/src/CacheImpl.cpp
+++ b/src/cppcache/src/CacheImpl.cpp
@@ -49,7 +49,6 @@ volatile bool CacheImpl::s_networkhop = false;
volatile int CacheImpl::s_blacklistBucketTimeout = 0;
ACE_Recursive_Thread_Mutex CacheImpl::s_nwHopLock;
volatile int8_t CacheImpl::s_serverGroupFlag = 0;
-MemberListForVersionStampPtr CacheImpl::s_versionStampMemIdList = nullptr;
#define DEFAULT_LRU_MAXIMUM_ENTRIES 100000
@@ -153,8 +152,6 @@ CacheImpl::CacheImpl(Cache* c, const char* name, DistributedSystemPtr sys,
void CacheImpl::initServices() {
m_tcrConnectionManager = new TcrConnectionManager(this);
PdxTypeRegistry::init();
- CacheImpl::s_versionStampMemIdList =
- MemberListForVersionStampPtr(new MemberListForVersionStamp());
if (!m_initDone && m_attributes != nullptr && m_attributes->getEndpoints()) {
if (PoolManager::getAll().size() > 0 && getCacheMode()) {
LOGWARN(
@@ -365,8 +362,6 @@ void CacheImpl::close(bool keepalive) {
m_adminRegion = nullptr;
}
- CacheImpl::s_versionStampMemIdList = nullptr;
-
// The TCCM gets destroyed when CacheImpl is destroyed, but after that there
// is still a window for the ping related registered task to get activated
// because expiryTaskManager is closed in DS::disconnect. If this happens
@@ -924,5 +919,7 @@ CacheTransactionManagerPtr CacheImpl::getCacheTransactionManager() {
return m_cacheTXManager;
}
MemberListForVersionStampPtr CacheImpl::getMemberListForVersionStamp() {
- return CacheImpl::s_versionStampMemIdList;
+
+ static auto versionStampMemIdList = std::make_shared<MemberListForVersionStamp>();
+ return versionStampMemIdList;
}
http://git-wip-us.apache.org/repos/asf/geode-native/blob/6708bf39/src/cppcache/src/CacheImpl.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/CacheImpl.hpp b/src/cppcache/src/CacheImpl.hpp
index 7ce8550..f0dede3 100644
--- a/src/cppcache/src/CacheImpl.hpp
+++ b/src/cppcache/src/CacheImpl.hpp
@@ -286,7 +286,6 @@ class CPPCACHE_EXPORT CacheImpl : private NonCopyable, private NonAssignable {
static volatile bool s_networkhop;
static volatile int s_blacklistBucketTimeout;
static volatile int8_t s_serverGroupFlag;
- static MemberListForVersionStampPtr s_versionStampMemIdList;
PoolPtr m_defaultPool;
bool m_ignorePdxUnreadFields;
bool m_readPdxSerialized;