commit 3a51a80c27c4e811526eb489a305f08647381955
author Matthew Reddington <mreddington@pivotal.io> Wed Oct 23 21:48:09 2019 -0700
committer Michael Martell <mmartell@pivotal.io> Wed Oct 23 21:48:09 2019 -0700
tree 0468f5abf176c2eeaf5bfd151b364996744b1a84
parent 2c70be377941487a5ff45eccea04ef65a51dd61c

GEODE-7347: Guarding CacheImpl during Cache move to avoid race condition. (#542)

Co-authored-by: Mike Oleske<moleske@pivotal.io>

cppcache/include/geode/Cache.hpp

diff --git a/cppcache/include/geode/Cache.hpp b/cppcache/include/geode/Cache.hpp
index f1f1d6b..3a0635c 100644
--- a/cppcache/include/geode/Cache.hpp
+++ b/cppcache/include/geode/Cache.hpp
@@ -254,7 +254,7 @@
         bool readPdxSerialized,
         const std::shared_ptr<AuthInitialize>& authInitialize);
 
-  std::shared_ptr<CacheImpl> m_cacheImpl;
+  std::unique_ptr<CacheImpl> m_cacheImpl;
 
  protected:
   static bool isPoolInMultiuserMode(std::shared_ptr<Region> regionPtr);

cppcache/src/Cache.cpp

diff --git a/cppcache/src/Cache.cpp b/cppcache/src/Cache.cpp
index e041eb0..af740c9 100644
--- a/cppcache/src/Cache.cpp
+++ b/cppcache/src/Cache.cpp
@@ -112,16 +112,19 @@
           new CacheImpl(this, dsProp, ignorePdxUnreadFields, readPdxSerialized,
                         authInitialize))) {}
 
-Cache::Cache(Cache&& other) noexcept
-    : m_cacheImpl(std::move(other.m_cacheImpl)) {
-  m_cacheImpl->setCache(this);
+Cache::Cache(Cache&& other) noexcept {
+  other.m_cacheImpl->doIfDestroyNotPending([&]() {
+    m_cacheImpl = std::move(other.m_cacheImpl);
+    m_cacheImpl->setCache(this);
+  });
 }
 
 Cache& Cache::operator=(Cache&& other) noexcept {
-  if (this != &other) {
+  other.m_cacheImpl->doIfDestroyNotPending([&]() {
     m_cacheImpl = std::move(other.m_cacheImpl);
     m_cacheImpl->setCache(this);
-  }
+  });
+
   return *this;
 }