Mercurial > hg > orthanc

changeset 6386:0b94f843be89

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
cppcheck: invalidLifetime -> re-enabled JobsEngine.SequenceOfOperationsJob
author Alain Mazy <am@orthanc.team>
date Mon, 10 Nov 2025 18:44:19 +0100
parents dfb2085b778c
children 32c736c4beb7
files OrthancFramework/UnitTestsSources/JobsTests.cpp OrthancServer/Sources/ServerJobs/StorageCommitmentScpJob.cpp
diffstat 2 files changed, 7 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/OrthancFramework/UnitTestsSources/JobsTests.cpp	Mon Nov 10 18:39:19 2025 +0100
+++ b/OrthancFramework/UnitTestsSources/JobsTests.cpp	Mon Nov 10 18:44:19 2025 +0100
@@ -733,25 +733,26 @@
 }
 
 
-TEST(JobsEngine, DISABLED_SequenceOfOperationsJob)
+TEST(JobsEngine, SequenceOfOperationsJob)
 {
   JobsEngine engine(10);
   engine.SetThreadSleep(10);
   engine.SetWorkersCount(3);
   engine.Start();
 
-  SequenceOfOperationsJob* job = NULL;
-
   {
     std::string id;
-    std::unique_ptr<SequenceOfOperationsJob> a(new SequenceOfOperationsJob);
-    job = a.get();
-    engine.GetRegistry().Submit(id, a.release(), 0);
+    std::unique_ptr<SequenceOfOperationsJob> seq(new SequenceOfOperationsJob);
+    engine.GetRegistry().Submit(id, seq.release(), 0);
   }
 
   boost::this_thread::sleep(boost::posix_time::milliseconds(500));
 
   {
+    SequenceOfOperationsJob* job = NULL;
+    std::unique_ptr<SequenceOfOperationsJob> seq(new SequenceOfOperationsJob);
+    job = seq.get();
+
     SequenceOfOperationsJob::Lock lock(*job);
     size_t i = lock.AddOperation(new LogJobOperation);
     size_t j = lock.AddOperation(new LogJobOperation);
--- a/OrthancServer/Sources/ServerJobs/StorageCommitmentScpJob.cpp	Mon Nov 10 18:39:19 2025 +0100
+++ b/OrthancServer/Sources/ServerJobs/StorageCommitmentScpJob.cpp	Mon Nov 10 18:44:19 2025 +0100
@@ -420,7 +420,6 @@
                                                    const Json::Value& serialized) :
     SetOfCommandsJob(new Unserializer(*this), serialized),
     context_(context),
-    ready_(false),
     transactionUid_(SerializationToolbox::ReadString(serialized, TRANSACTION_UID)),
     calledAet_(SerializationToolbox::ReadString(serialized, CALLED_AET))
     // "ready_" is initialized by the unserializer