Changeset 1928

Timestamp:

05/28/09 15:48:54 (16 years ago)

Author:

msteinbi

Message:

corrected job reset when client logs out (#466)

File:

• trunk/sources/HeuristicLab.Hive.Server.Core/3.2/ClientCommunicator.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Hive.Server.Core/3.2/ClientCommunicator.cs

@@ -285 +285 @@
     /// <param name="response"></param>
     private void processJobProcess(HeartBeatData hbData, IJobAdapter jobAdapter, IClientAdapter clientAdapter, ResponseHB response) {
-      if (hbData.JobProgress != null) {
+      if (hbData.JobProgress != null && hbData.JobProgress.Count > 0) {
         List<Job> jobsOfClient = new List<Job>(jobAdapter.GetActiveJobsOf(clientAdapter.GetById(hbData.ClientId)));
         if (jobsOfClient == null || jobsOfClient.Count == 0) {
@@ -537 +537 @@
           return response;
         }
-        List<Job> allJobs = new List<Job>(jobAdapter.GetAll());
         if (client.State == State.calculating) {
           // check wich job the client was calculating and reset it
-          foreach (Job job in allJobs) {
-            if (job.Client != null) {
-              if (job.Client.Id == client.Id) {
-                jobManager.ResetJobsDependingOnResults(job);
-              }
-            }
+          ICollection<Job> jobsOfClient = jobAdapter.GetJobsOf(client);
+          foreach (Job job in jobsOfClient) {
+            if (job.State != State.finished)
+              jobManager.ResetJobsDependingOnResults(job);
           }
         }