--- a/Core/JobsEngine/JobsRegistry.cpp	Tue Jun 09 11:37:52 2020 +0200
+++ b/Core/JobsEngine/JobsRegistry.cpp	Tue Jun 09 12:21:03 2020 +0200
@@ -20,7 +20,7 @@
  * you do not wish to do so, delete this exception statement from your
  * version. If you delete this exception statement from all source files
  * in the program, then also delete it here.
- * 
+ *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
@@ -50,10 +50,10 @@
   static const char* CREATION_TIME = "CreationTime";
   static const char* LAST_CHANGE_TIME = "LastChangeTime";
   static const char* RUNTIME = "Runtime";
-  
+
 
   class JobsRegistry::JobHandler : public boost::noncopyable
-  {   
+  {
   private:
     std::string                       id_;
     JobState                          state_;
@@ -80,7 +80,7 @@
       lastStateChangeTime_ = now;
     }
 
-    void SetStateInternal(JobState state) 
+    void SetStateInternal(JobState state)
     {
       state_ = state;
       pauseScheduled_ = false;
@@ -139,7 +139,7 @@
       return state_;
     }
 
-    void SetState(JobState state) 
+    void SetState(JobState state)
     {
       if (state == JobState_Retry)
       {
@@ -157,7 +157,7 @@
       if (state_ == JobState_Running)
       {
         SetStateInternal(JobState_Retry);
-        retryTime_ = (boost::posix_time::microsec_clock::universal_time() + 
+        retryTime_ = (boost::posix_time::microsec_clock::universal_time() +
                       boost::posix_time::milliseconds(timeout));
       }
       else
@@ -275,7 +275,7 @@
           ok = false;
         }
       }
-      else 
+      else
       {
         ok = job_->Serialize(target[JOB]);
       }
@@ -327,14 +327,14 @@
                                                      JobHandler*& b) const
   {
     return a->GetPriority() < b->GetPriority();
-  }                       
+  }
 
 
 #if defined(NDEBUG)
   void JobsRegistry::CheckInvariants() const
   {
   }
-  
+
 #else
   bool JobsRegistry::IsPendingJob(const JobHandler& job) const
   {
@@ -409,16 +409,16 @@
         case JobState_Pending:
           assert(!IsRetryJob(job) && IsPendingJob(job) && !IsCompletedJob(job));
           break;
-            
+
         case JobState_Success:
         case JobState_Failure:
           assert(!IsRetryJob(job) && !IsPendingJob(job) && IsCompletedJob(job));
           break;
-            
+
         case JobState_Retry:
           assert(IsRetryJob(job) && !IsPendingJob(job) && !IsCompletedJob(job));
           break;
-            
+
         case JobState_Running:
         case JobState_Paused:
           assert(!IsRetryJob(job) && !IsPendingJob(job) && !IsCompletedJob(job));
@@ -482,7 +482,7 @@
       default:
         throw OrthancException(ErrorCode_InternalError);
     }
-    
+
     LOG(INFO) << "Job has completed with " << tmp << ": " << job.GetId();
 
     CheckInvariants();
@@ -560,7 +560,7 @@
     }
   }
 
-  
+
   JobsRegistry::~JobsRegistry()
   {
     for (JobsIndex::iterator it = jobsIndex_.begin(); it != jobsIndex_.end(); ++it)
@@ -668,13 +668,13 @@
     {
       throw OrthancException(ErrorCode_NullPointer);
     }
-    
+
     std::unique_ptr<JobHandler>  protection(handler);
 
     {
       boost::mutex::scoped_lock lock(mutex_);
       CheckInvariants();
-      
+
       id = handler->GetId();
       int priority = handler->GetPriority();
 
@@ -689,18 +689,18 @@
           pendingJobs_.push(handler);
           pendingJobAvailable_.notify_one();
           break;
- 
+
         case JobState_Success:
           SetCompletedJob(*handler, true);
           break;
-        
+
         case JobState_Failure:
           SetCompletedJob(*handler, false);
           break;
 
         case JobState_Paused:
           break;
-        
+
         default:
         {
           std::string details = ("A job should not be loaded from state: " +
@@ -798,7 +798,7 @@
             const JobStatus& status = it->second->GetLastStatus();
             successContent = status.GetPublicContent();
           }
-          
+
           return;
         }
         else
@@ -875,7 +875,7 @@
   void JobsRegistry::RemoveRetryJob(JobHandler* handler)
   {
     RetryJobs::iterator item = retryJobs_.find(handler);
-    assert(item != retryJobs_.end());            
+    assert(item != retryJobs_.end());
     retryJobs_.erase(item);
   }
 
@@ -962,7 +962,7 @@
           SetCompletedJob(*found->second, false);
           found->second->SetLastErrorCode(ErrorCode_CanceledJob);
           break;
-        
+
         case JobState_Success:
         case JobState_Failure:
           // Nothing to be done
@@ -1010,7 +1010,7 @@
       pendingJobs_.push(found->second);
       pendingJobAvailable_.notify_one();
       CheckInvariants();
-      return true;      
+      return true;
     }
   }
 
@@ -1037,9 +1037,9 @@
     else
     {
       found->second->GetJob().Reset();
-      
+
       bool ok = false;
-      for (CompletedJobs::iterator it = completedJobs_.begin(); 
+      for (CompletedJobs::iterator it = completedJobs_.begin();
            it != completedJobs_.end(); ++it)
       {
         if (*it == found->second)
@@ -1106,14 +1106,14 @@
     observer_ = &observer;
   }
 
-  
+
   void JobsRegistry::ResetObserver()
   {
     boost::mutex::scoped_lock lock(mutex_);
     observer_ = NULL;
   }
 
-  
+
   JobsRegistry::RunningJob::RunningJob(JobsRegistry& registry,
                                        unsigned int timeout) :
     registry_(registry),
@@ -1156,7 +1156,7 @@
     }
   }
 
-      
+
   JobsRegistry::RunningJob::~RunningJob()
   {
     if (IsValid())
@@ -1176,26 +1176,26 @@
 
         case JobState_Paused:
           registry_.MarkRunningAsPaused(*handler_);
-          break;            
+          break;
 
         case JobState_Retry:
           registry_.MarkRunningAsRetry(*handler_, targetRetryTimeout_);
           break;
-            
+
         default:
           assert(0);
       }
     }
   }
 
-      
+
   bool JobsRegistry::RunningJob::IsValid() const
   {
     return (handler_ != NULL &&
             job_ != NULL);
   }
 
-      
+
   const std::string& JobsRegistry::RunningJob::GetId() const
   {
     if (!IsValid())
@@ -1208,7 +1208,7 @@
     }
   }
 
-      
+
   int JobsRegistry::RunningJob::GetPriority() const
   {
     if (!IsValid())
@@ -1220,7 +1220,7 @@
       return priority_;
     }
   }
-      
+
 
   IJob& JobsRegistry::RunningJob::GetJob()
   {
@@ -1234,7 +1234,7 @@
     }
   }
 
-      
+
   bool JobsRegistry::RunningJob::IsPauseScheduled()
   {
     if (!IsValid())
@@ -1246,12 +1246,12 @@
       boost::mutex::scoped_lock lock(registry_.mutex_);
       registry_.CheckInvariants();
       assert(handler_->GetState() == JobState_Running);
-        
+
       return handler_->IsPauseScheduled();
     }
   }
 
-      
+
   bool JobsRegistry::RunningJob::IsCancelScheduled()
   {
     if (!IsValid())
@@ -1263,12 +1263,12 @@
       boost::mutex::scoped_lock lock(registry_.mutex_);
       registry_.CheckInvariants();
       assert(handler_->GetState() == JobState_Running);
-        
+
       return handler_->IsCancelScheduled();
     }
   }
 
-      
+
   void JobsRegistry::RunningJob::MarkSuccess()
   {
     if (!IsValid())
@@ -1281,7 +1281,7 @@
     }
   }
 
-      
+
   void JobsRegistry::RunningJob::MarkFailure()
   {
     if (!IsValid())
@@ -1294,7 +1294,7 @@
     }
   }
 
-      
+
   void JobsRegistry::RunningJob::MarkCanceled()
   {
     if (!IsValid())
@@ -1308,7 +1308,7 @@
     }
   }
 
-      
+
   void JobsRegistry::RunningJob::MarkPause()
   {
     if (!IsValid())
@@ -1321,7 +1321,7 @@
     }
   }
 
-      
+
   void JobsRegistry::RunningJob::MarkRetry(unsigned int timeout)
   {
     if (!IsValid())
@@ -1334,7 +1334,7 @@
       targetRetryTimeout_ = timeout;
     }
   }
-      
+
 
   void JobsRegistry::RunningJob::UpdateStatus(ErrorCode code,
                                               const std::string& details)
@@ -1346,11 +1346,11 @@
     else
     {
       JobStatus status(code, details, *job_);
-          
+
       boost::mutex::scoped_lock lock(registry_.mutex_);
       registry_.CheckInvariants();
       assert(handler_->GetState() == JobState_Running);
-        
+
       handler_->SetLastStatus(status);
     }
   }
@@ -1365,8 +1365,8 @@
     target = Json::objectValue;
     target[TYPE] = JOBS_REGISTRY;
     target[JOBS] = Json::objectValue;
-    
-    for (JobsIndex::const_iterator it = jobsIndex_.begin(); 
+
+    for (JobsIndex::const_iterator it = jobsIndex_.begin();
          it != jobsIndex_.end(); ++it)
     {
       Json::Value v;
@@ -1440,7 +1440,7 @@
     running = 0;
     success = 0;
     failed = 0;
-    
+
     for (JobsIndex::const_iterator it = jobsIndex_.begin();
          it != jobsIndex_.end(); ++it)
     {
@@ -1457,7 +1457,7 @@
         case JobState_Running:
           running ++;
           break;
-          
+
         case JobState_Success:
           success ++;
           break;
@@ -1469,6 +1469,6 @@
         default:
           throw OrthancException(ErrorCode_InternalError);
       }
-    }    
+    }
   }
 }