Changeset 2114 for trunk

Timestamp:

06/26/09 11:48:24 (16 years ago)

Author:

gkronber

Message:

• fixed a bug in determination of JobState in HiveGridServerWrapper
• fixed a bug in discrimination between snap shot results and end results in HiveGridServerWrapper

#679 (HiveGridWrapper treats snap shot results the same way as end results)

File:

• trunk/sources/HeuristicLab.Grid.HiveBridge/3.2/HiveGridServerWrapper.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Grid.HiveBridge/3.2/HiveGridServerWrapper.cs

@@ -49 +49 @@
     public JobState JobState(Guid guid) {
       ResponseObject<SerializedJobResult> response = SavelyExecute(() => executionEngine.GetLastSerializedResult(guid, false));
-      if (response != null && response.Success == true &&
-        (response.StatusMessage == ApplicationConstants.RESPONSE_JOB_RESULT_NOT_YET_HERE ||
-          response.StatusMessage == ApplicationConstants.RESPONSE_JOB_REQUEST_SET ||
-          response.StatusMessage == ApplicationConstants.RESPONSE_JOB_REQUEST_ALLREADY_SET ||
-          response.StatusMessage == ApplicationConstants.RESPONSE_JOB_JOB_RESULT_SENT)) {
+      if (response != null) {
         return HeuristicLab.Grid.JobState.Busy;
       } else return HeuristicLab.Grid.JobState.Unknown;
@@ -71 +67 @@
         HeuristicLab.Hive.Engine.Job restoredJob = (HeuristicLab.Hive.Engine.Job)PersistenceManager.RestoreFromGZip(response.Obj.SerializedJobResultData);
         // only return the engine when it wasn't canceled (result is only a snapshot)
-        if (restoredJob.Progress < 1.0) {
+        if (restoredJob.Progress == 1.0) {
           // Serialize the engine
           MemoryStream memStream = new MemoryStream();