Try to disable DataHandle::commit()

GaudiHive/src/AlgoExecutionTask.cpp

@@ -55,8 +55,10 @@ tbb::task* AlgoExecutionTask::execute()
     eventfailed = true;
   }
 
+#if defined( GAUDI_V30_DATAHANDLE_COMMIT )
   // Commit all DataHandles
   this_algo->commitHandles();
+#endif
 
   // DP it is important to propagate the failure of an event.
   // We need to stop execution when this happens so that execute run can

GaudiHive/src/HLTEventLoopMgr.cpp

@@ -548,8 +548,10 @@ tbb::task* HLTEventLoopMgr::HLTExecutionTask::execute()
       eventfailed = true;
     }
 
+#if defined( GAUDI_V30_DATAHANDLE_COMMIT )
     // Commit all DataHandles
     this_algo->commitHandles();
+#endif
 
     // DP it is important to propagate the failure of an event.
     // We need to stop execution when this happens so that execute run can

GaudiHive/src/IOBoundAlgTask.cpp

@@ -56,8 +56,10 @@ StatusCode IOBoundAlgTask::execute()
     eventfailed = true;
   }
 
+#if defined( GAUDI_V30_DATAHANDLE_COMMIT )
   // Commit all DataHandles
   this_algo->commitHandles();
+#endif
 
   // DP it is important to propagate the failure of an event.
   // We need to stop execution when this happens so that execute run can

GaudiKernel/GaudiKernel/AlgTool.h

@@ -209,7 +209,9 @@ public:
 public:
   void acceptDHVisitor( IDataHandleVisitor* ) const override;
 
+#if defined( GAUDI_V30_DATAHANDLE_COMMIT )
   void commitHandles() override;
+#endif
 
 public:
   void registerTool( IAlgTool* tool ) const

GaudiKernel/GaudiKernel/Algorithm.h

@@ -439,7 +439,9 @@ public:
 public:
   void acceptDHVisitor( IDataHandleVisitor* ) const override;
 
+#if defined( GAUDI_V30_DATAHANDLE_COMMIT )
   void commitHandles() override;
+#endif
 
 public:
   void registerTool( IAlgTool* tool ) const;

GaudiKernel/GaudiKernel/DataHandle.h

@@ -50,7 +50,14 @@ namespace Gaudi
     virtual const DataObjID& fullKey() const { return m_key; }
 
     virtual void reset( bool ){};
+
+#if defined( GAUDI_V30_DATAHANDLE_COMMIT )
+    /// This hook, is called after Algorithm::execute() by GaudiHive's algorithm
+    /// execution tasks. It was meant to allow automatically publishing data
+    /// objects to the whiteboard at the end of algorithm execution. However,
+    /// it is not used anymore, and scheduled for removal.
     virtual StatusCode commit() { return StatusCode::SUCCESS; }
+#endif
 
     virtual std::string pythonRepr() const;
     virtual bool init() { return true; }

GaudiKernel/GaudiKernel/IDataHandleHolder.h

@@ -22,7 +22,9 @@ public:
 
   virtual void acceptDHVisitor( IDataHandleVisitor* ) const = 0;
 
+#if defined( GAUDI_V30_DATAHANDLE_COMMIT )
   virtual void commitHandles() = 0;
+#endif
 
   virtual const DataObjIDColl& inputDataObjs() const  = 0;
   virtual const DataObjIDColl& outputDataObjs() const = 0;

GaudiKernel/src/Lib/AlgTool.cpp

@@ -516,6 +516,7 @@ void AlgTool::acceptDHVisitor( IDataHandleVisitor* vis ) const
 }
 
 //-----------------------------------------------------------------------------
+#if defined( GAUDI_V30_DATAHANDLE_COMMIT )
 void AlgTool::commitHandles()
 {
   //-----------------------------------------------------------------------------
@@ -527,3 +528,4 @@ void AlgTool::commitHandles()
     if ( at ) at->commitHandles();
   }
 }
+#endif
\ No newline at end of file

GaudiKernel/src/Lib/Algorithm.cpp

@@ -957,6 +957,7 @@ SmartIF<IService> Algorithm::service( const std::string& name, const bool create
 }
 
 //-----------------------------------------------------------------------------
+#if defined( GAUDI_V30_DATAHANDLE_COMMIT )
 void Algorithm::commitHandles()
 {
   //-----------------------------------------------------------------------------
@@ -977,6 +978,7 @@ void Algorithm::commitHandles()
     a->commitHandles();
   }
 }
+#endif
 
 void Algorithm::registerTool( IAlgTool* tool ) const
 {

cmake/GaudiBuildFlags.cmake

@@ -104,6 +104,9 @@ option(G22_NEW_SVCLOCATOR
 option(GAUDI_V22
        "enable some API extensions"
        OFF)
+option(GAUDI_V30_DATAHANDLE_COMMIT
+       "enable deprecated DataHandle::commit() hook and associated code"
+       OFF)
 
 if (BINARY_TAG_COMP_NAME STREQUAL "gcc" AND BINARY_TAG_COMP_VERSION VERSION_GREATER "5.0")
   option(GAUDI_SUGGEST_OVERRIDE "enable warnings for missing override keyword" ON)