Changeset 1772

Timestamp:

05/08/09 14:25:42 (16 years ago)

Author:

msteinbi

Message:

adapted handling of snapshot requests (#531)

Location:

trunk/sources

Files:

• HeuristicLab.Hive.Contracts/3.2/BusinessObjects/Client.cs (modified) (1 diff)
• HeuristicLab.Hive.Server.Core/3.2/ClientCommunicator.cs (modified) (2 diffs)
• HeuristicLab.Hive.Server.Core/3.2/JobManager.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Hive.Contracts/3.2/BusinessObjects/Client.cs

@@ -28 +28 @@
 namespace HeuristicLab.Hive.Contracts.BusinessObjects {
 
-  public enum State { nullState, idle, calculating, offline, finished, abort, requestSnapshot };
+  public enum State { nullState, idle, calculating, offline, finished, abort, requestSnapshot, requestSnapshotSent };
 
   [DataContract]

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

@@ -310 +310 @@
               // a request for a snapshot has been set
               response.ActionRequest.Add(new MessageContainer(MessageContainer.MessageType.RequestSnapshot, curJob.Id));
-              curJob.State = State.calculating;
+              curJob.State = State.requestSnapshotSent;
             }
           }
@@ -422 +422 @@
           return response;
         }
+        if (job.State == State.requestSnapshotSent) {
+          job.State = State.calculating;
+        }
         if (job.State != State.calculating) {
           response.Success = false;

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

@@ -239 +239 @@
 
         Job job = jobAdapter.GetById(jobId);
-        if (requested && job.State == State.requestSnapshot) {
+        if (requested && (job.State == State.requestSnapshot || job.State == State.requestSnapshotSent)) {
           response.Success = true;
           response.StatusMessage = ApplicationConstants.RESPONSE_JOB_RESULT_NOT_YET_HERE;