[#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 8e47a41a6e14f21393d83603dbd47a1d8b03a18c..8452032cd4203455c36530fb03981992422f6399 100644 (file)
--- 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(); }