v0.2.54..v0.2.55 changeset OsmChangesetFileWriterFactory.cpp - ngageoint/hootenanny GitHub Wiki

diff --git a/hoot-core/src/main/cpp/hoot/core/io/OsmChangesetFileWriterFactory.cpp b/hoot-core/src/main/cpp/hoot/core/io/OsmChangesetFileWriterFactory.cpp
index 3b125b8..c4b8db5 100644
--- a/hoot-core/src/main/cpp/hoot/core/io/OsmChangesetFileWriterFactory.cpp
+++ b/hoot-core/src/main/cpp/hoot/core/io/OsmChangesetFileWriterFactory.cpp
@@ -22,7 +22,7 @@
  * This will properly maintain the copyright information. DigitalGlobe
  * copyrights will be updated automatically.
  *
- * @copyright Copyright (C) 2019 DigitalGlobe (http://www.digitalglobe.com/)
+ * @copyright Copyright (C) 2019, 2020 DigitalGlobe (http://www.digitalglobe.com/)
  */
 #include "OsmChangesetFileWriterFactory.h"
 
@@ -36,19 +36,11 @@
 namespace hoot
 {
 
-std::shared_ptr<OsmChangesetFileWriterFactory> OsmChangesetFileWriterFactory::_theInstance;
-
-OsmChangesetFileWriterFactory::OsmChangesetFileWriterFactory()
-{
-}
-
 OsmChangesetFileWriterFactory& OsmChangesetFileWriterFactory::getInstance()
 {
-  if (!_theInstance.get())
-  {
-    _theInstance.reset(new OsmChangesetFileWriterFactory());
-  }
-  return *_theInstance;
+  //  Local static singleton instance
+  static OsmChangesetFileWriterFactory instance;
+  return instance;
 }
 
 std::shared_ptr<OsmChangesetFileWriter> OsmChangesetFileWriterFactory::createWriter(