Merge pull request #2242 from marta-lokhova/conditional_work_fixes

Conditional work fixes Reviewed-by: MonsieurNicolas
stellar · Aug 21, 2019 · 67c1fdd · 67c1fdd
2 parents 51b89d2 + b0a4bdb
commit 67c1fdd
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 0 deletions.
diff --git a/src/catchup/ApplyCheckpointWork.cpp b/src/catchup/ApplyCheckpointWork.cpp
@@ -293,4 +293,15 @@ ApplyCheckpointWork::onRun()
         return State::WORK_FAILURE;
     }
 }
+
+void
+ApplyCheckpointWork::onSuccess()
+{
+    if (mFilesOpen)
+    {
+        mHdrIn.close();
+        mTxIn.close();
+        mFilesOpen = false;
+    }
+}
 }
diff --git a/src/catchup/ApplyCheckpointWork.h b/src/catchup/ApplyCheckpointWork.h
@@ -75,5 +75,6 @@ class ApplyCheckpointWork : public BasicWork
     {
         return true;
     };
+    void onSuccess() override;
 };
 }
diff --git a/src/work/ConditionalWork.cpp b/src/work/ConditionalWork.cpp
@@ -67,6 +67,7 @@ ConditionalWork::onRun()
             "Condition for {} is satisfied: starting work", getName());
         mConditionedWork->startWork(wakeSelfUpCallback());
         mWorkStarted = true;
+        mCondition = nullptr;
         return this->onRun();
     }
 }