diff Core/JobsEngine/JobsRegistry.cpp @ 2652:a3f0f61a14ca jobs

fix
author Sebastien Jodogne <s.jodogne@gmail.com>
date Mon, 04 Jun 2018 12:36:24 +0200
parents e1893d31652a
children c196d76cb8fa
line wrap: on
line diff
--- a/Core/JobsEngine/JobsRegistry.cpp	Mon Jun 04 11:53:12 2018 +0200
+++ b/Core/JobsEngine/JobsRegistry.cpp	Mon Jun 04 12:36:24 2018 +0200
@@ -266,7 +266,6 @@
       cancelScheduled_(false)
     {
       state_ = StringToJobState(IJobUnserializer::GetString(serialized, "State"));
-      jobType_ = IJobUnserializer::GetString(serialized, "Type");
       priority_ = IJobUnserializer::GetInteger(serialized, "Priority");
       creationTime_ = boost::posix_time::from_iso_string
         (IJobUnserializer::GetString(serialized, "CreationTime"));
@@ -280,16 +279,10 @@
         state_ = JobState_Pending;
       }
 
-      job_.reset(unserializer.UnserializeJob(jobType_, serialized["Job"]));
+      job_.reset(unserializer.UnserializeJob(serialized["Job"]));
+      job_->GetJobType(jobType_);
+      job_->Start();
 
-      std::string s;
-      job_->GetJobType(s);
-      if (s != jobType_)
-      {
-        throw OrthancException(ErrorCode_InternalError);
-      }
-
-      job_->Start();
       lastStatus_ = JobStatus(ErrorCode_Success, *job_);
     }
   };