v0.2.54..v0.2.55 changeset SignalCatcher.cpp

diff --git a/hoot-core/src/main/cpp/hoot/core/util/SignalCatcher.cpp b/hoot-core/src/main/cpp/hoot/core/util/SignalCatcher.cpp
index 6a672d2..a0e10f4 100644
--- a/hoot-core/src/main/cpp/hoot/core/util/SignalCatcher.cpp
+++ b/hoot-core/src/main/cpp/hoot/core/util/SignalCatcher.cpp
@@ -22,7 +22,7 @@
  * This will properly maintain the copyright information. DigitalGlobe
  * copyrights will be updated automatically.
  *
- * @copyright Copyright (C) 2015, 2017, 2019 DigitalGlobe (http://www.digitalglobe.com/)
+ * @copyright Copyright (C) 2015, 2017, 2019, 2020 DigitalGlobe (http://www.digitalglobe.com/)
  */
 
 #include "SignalCatcher.h"
@@ -39,18 +39,11 @@
 namespace hoot
 {
 
-std::shared_ptr<SignalCatcher> SignalCatcher::_instance;
-
-SignalCatcher::SignalCatcher()
-  : _defaultSet(false)
-{
-}
-
-std::shared_ptr<SignalCatcher> SignalCatcher::getInstance()
+SignalCatcher& SignalCatcher::getInstance()
 {
-  if (!SignalCatcher::_instance)
-    SignalCatcher::_instance.reset(new SignalCatcher());
-  return SignalCatcher::_instance;
+  //  Local static singleton instance
+  static SignalCatcher instance;
+  return instance;
 }
 
 void SignalCatcher::registerDefaultHandlers()