Merge pull request #197 from eclipse-4diac/freeze

Freeze
eclipse-4diac · Jul 24, 2024 · f51c373 · f51c373
2 parents 3db3d21 + 6d6f38c
commit f51c373
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/arch/threadbase.tpp b/src/arch/threadbase.tpp
@@ -46,7 +46,6 @@ template <typename TThreadHandle, TThreadHandle nullHandle, typename ThreadDelet
 void CThreadBase<TThreadHandle, nullHandle, ThreadDeletePolicy>::stop() {
   if(nullHandle != mThreadHandle){
     setAlive(false);
-    mThreadHandle = nullHandle;  //indicate that thread is in shutdownmode
   }
 }
 
@@ -75,6 +74,7 @@ void CThreadBase<TThreadHandle, nullHandle, ThreadDeletePolicy>::runThread(CThre
     paThread->setAlive(true);
     paThread->run();
     paThread->setAlive(false);
+    paThread->mThreadHandle = nullHandle;
     paThread->mJoinSem.inc();
     ThreadDeletePolicy::deleteThread(threadHandle);
   } else {

diff --git a/src/stdfblib/ita/FakeTimeDev.cpp b/src/stdfblib/ita/FakeTimeDev.cpp
@@ -92,7 +92,7 @@ CDataConnection **FakeTimeDev::getDIConUnchecked(const TPortId paIndex) {
   return nullptr;
 }
 
-EMGMResponse FakeTimeDev::writeValue(forte::core::TNameIdentifier &paNameList, const CIEC_STRING & paValue, bool paForce) {
+EMGMResponse FakeTimeDev::writeValue(forte::core::TNameIdentifier &paNameList, const std::string & paValue, bool paForce) {
   // parent writeValue is modifying the name list so we need to get the name as backup here
   CStringDictionary::TStringId portName = paNameList.back();
   EMGMResponse eRetVal = CDevice::writeValue(paNameList, paValue, paForce);

diff --git a/src/stdfblib/ita/FakeTimeDev.h b/src/stdfblib/ita/FakeTimeDev.h
@@ -36,7 +36,7 @@ class FakeTimeDev : public CDevice{
 
     EMGMResponse changeFBExecutionState(EMGMCommandType paCommand) override;
 
-    EMGMResponse writeValue(forte::core::TNameIdentifier &paNameList, const CIEC_STRING & paValue, bool paForce = false) override;
+    EMGMResponse writeValue(forte::core::TNameIdentifier &paNameList, const std::string & paValue, bool paForce = false) override;
 
   private:
     CInterface2InternalDataConnection mDConnMGR_ID;