Remove std::call_once wrapper around JFactory::Init

This doesn't make our factories safer or more correct, and may be responsible for the very simple test case that mysteriously hangs, but only during the Docker CI job.
JeffersonLab · Apr 18, 2024 · e745f43 · e745f43
1 parent df65224
commit e745f43
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/src/libraries/JANA/JFactory.cc b/src/libraries/JANA/JFactory.cc
@@ -14,7 +14,7 @@ void JFactory::Create(const std::shared_ptr<const JEvent>& event) {
 
     if (mStatus == Status::Uninitialized) {
         try {
-            std::call_once(mInitFlag, &JFactory::Init, this);
+            Init();
             mStatus = Status::Unprocessed;
         }
         catch (JException& ex) {

diff --git a/src/libraries/JANA/JFactory.h b/src/libraries/JANA/JFactory.h
@@ -202,9 +202,6 @@ class JFactory {
 
     CreationStatus mCreationStatus = CreationStatus::NotCreatedYet;
 
-    // Used to make sure Init is called only once
-    std::once_flag mInitFlag;
-
     // Common to components
     JEventLevel mLevel = JEventLevel::Event;
     std::string mPluginName;