Changeset 1770 for trunk

Timestamp:

05/08/09 14:17:28 (15 years ago)

Author:

msteinbi

Message:

new functionality for snapshot requesting (#531)

Location:

trunk/sources

Files:

• HeuristicLab.Hive.Contracts/3.2/ApplicationConstants.cs (modified) (1 diff)
• HeuristicLab.Hive.Server.Core/3.2/ClientCommunicator.cs (modified) (1 diff)
• HeuristicLab.Hive.Server.Core/3.2/JobManager.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Hive.Contracts/3.2/ApplicationConstants.cs

@@ -93 +93 @@
     public static string RESPONSE_JOB_REQUEST_SET = "Job.RequestSet";
     public static string RESPONSE_JOB_ABORT_REQUEST_SET = "Job.AbortRequestSet";
+    public static string RESPONSE_JOB_RESULT_NOT_YET_HERE = "Requested job result is not yet finished";
   }
 }

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

@@ -301 +301 @@
             // a request to abort the job has been set
             response.ActionRequest.Add(new MessageContainer(MessageContainer.MessageType.AbortJob, curJob.Id));
-            curJob.State = State.offline;
+            curJob.State = State.finished;
           } else {
             // save job progress

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

@@ -237 +237 @@
 
         ResponseObject<JobResult> response = new ResponseObject<JobResult>();
+
+        Job job = jobAdapter.GetById(jobId);
+        if (requested && job.State == State.requestSnapshot) {
+          response.Success = true;
+          response.StatusMessage = ApplicationConstants.RESPONSE_JOB_RESULT_NOT_YET_HERE;
+          return response;
+        }
+          
         response.Success = true;
         response.StatusMessage = ApplicationConstants.RESPONSE_JOB_JOB_RESULT_SENT;
-        response.Obj = GetLastJobResult(jobAdapter.GetById(jobId));
+        response.Obj = GetLastJobResult(job);
 
         return response;