Changeset 1160 for trunk/sources/HeuristicLab.Hive.Server.Core/JobManager.cs

Timestamp:

01/21/09 16:22:25 (16 years ago)

Author:

msteinbi

Message:

Implementing Lifecycle Management (#453)

File:

• trunk/sources/HeuristicLab.Hive.Server.Core/JobManager.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Hive.Server.Core/JobManager.cs

@@ -50 +50 @@
 
     public void ResetJobsDependingOnResults(Job job) {
-      List<JobResult> allJobResults = new List<JobResult>(jobResultAdapter.GetAll());
+      List<JobResult> allJobResults = new List<JobResult>(jobResultAdapter.GetResultsOf(job));
       JobResult lastJobResult = null;
       foreach (JobResult jR in allJobResults) {
-        if (jR.Job != null && jR.Job.Id == job.Id) {
-          if (lastJobResult != null) {
-            // if lastJobResult was before the current jobResult the lastJobResult must be updated
-            if ((jR.timestamp.Subtract(lastJobResult.timestamp)).Seconds > 0)
-              lastJobResult = jR;
-          }
-        }
+        // if lastJobResult was before the current jobResult the lastJobResult must be updated
+        if (lastJobResult == null ||          
+            (jR.timestamp > lastJobResult.timestamp))
+          lastJobResult = jR;
       }
       if (lastJobResult != null) {
-        job.Client = null;
         job.Percentage = lastJobResult.Percentage;
-        job.State = State.offline;
         job.SerializedJob = lastJobResult.Result;
       } else {
-        job.Client = null;
         job.Percentage = 0;
-        job.State = State.offline;
       }
+
+      job.Client = null;
+      job.State = State.offline;
+
       jobAdapter.Update(job);
     }