Merge pull request #8223 from PowerDNS/omoerbeek-patch-1

[thirdparty/pdns.git] / pdns / sholder.hh

diff --git a/pdns/sholder.hh b/pdns/sholder.hh
index 457f3378578d92f5271c8c90dfe22a2f9f0cc803..75837c30f1461280db8544bc3e1662faf91116ca 100644 (file)
--- a/pdns/sholder.hh
+++ b/pdns/sholder.hh
@@ -19,6 +19,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
+#pragma once
 #include <memory>
 #include <atomic>
 #include <mutex>
@@ -93,9 +94,12 @@ public:
 
   void setState(T state) //!< Safely & slowly change the global state
   {
-    std::lock_guard<std::mutex> l(d_lock);
-    d_state = std::make_shared<T>(T(state));
-    d_generation++;
+    std::shared_ptr<T> newState = std::make_shared<T>(state);
+    {
+      std::lock_guard<std::mutex> l(d_lock);
+      d_state = newState;
+      d_generation++;
+    }
   }
 
   T getCopy() const  //!< Safely & slowly get a copy of the global state
@@ -110,7 +114,7 @@ public:
     std::lock_guard<std::mutex> l(d_lock); 
     auto state=*d_state; // and yes, these three steps are necessary, can't ever modify state in place, even when locked!
     act(state);
-    d_state = std::make_shared<T>(T(state));
+    d_state = std::make_shared<T>(state);
     ++d_generation;
   }