From: Francis Dupont <fdupont@isc.org>
Date: Mon, 2 Nov 2020 19:59:41 +0000 (+0100)
Subject: [#1442] Fixed unexpected dynamic cast failure
X-Git-Tag: Kea-1.9.2~162
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=281364cfa63ecace66093832d2188f7acc623cf7;p=thirdparty%2Fkea.git

[#1442] Fixed unexpected dynamic cast failure
---

diff --git a/src/bin/d2/tests/d2_command_unittest.cc b/src/bin/d2/tests/d2_command_unittest.cc
index 8e47a41a6e..8452032cd4 100644
--- a/src/bin/d2/tests/d2_command_unittest.cc
+++ b/src/bin/d2/tests/d2_command_unittest.cc
@@ -46,12 +46,12 @@ class NakedD2Controller : public D2Controller {
     // "Naked" D2 controller, exposes internal methods.
 public:
     static DControllerBasePtr& instance() {
-        if (!getController()) {
-            DControllerBasePtr controller_ptr(new NakedD2Controller());
-            setController(controller_ptr);
+        static DControllerBasePtr controller_ptr;
+        if (!controller_ptr) {
+            controller_ptr.reset(new NakedD2Controller());
         }
 
-        return (getController());
+        return (controller_ptr);
     }
 
     virtual ~NakedD2Controller() { deregisterCommands(); }