Changeset 4263 for branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Experiment/3.3/HiveExperiment.cs

Timestamp:

08/19/10 12:41:05 (14 years ago)

Author:

cneumuel

Message:

consolidated Response objects to use only StatusMessage with enums instead of strings.
removed Success property from Response. success is now represented by StatusMessage alone. (#1159)

File:

• branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Experiment/3.3/HiveExperiment.cs (modified) (5 diffs)

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Experiment/3.3/HiveExperiment.cs

@@ -42 +42 @@
 using System.Collections;
 using System.ServiceModel;
+using HeuristicLab.Hive.Contracts.ResponseObjects;
 
 namespace HeuristicLab.Hive.Experiment {
@@ -561 +562 @@
               LogMessage("Polling results for " + jobIdsToQuery.Count() + " jobs");
               try {
-                ResponseObject<JobResultList> response = executionEngineFacade.GetAllJobResults(jobIdsToQuery);
-                if (response.Success) {
+                ResponseObject<JobResultList> response = executionEngineFacade.GetJobResults(jobIdsToQuery);
+                if (response.StatusMessage == ResponseStatus.Ok) {
                   JobResultList jobItemList = response.Obj;
                   UpdateJobItems(jobItemList);
 
                   LogMessage("Polling successfully finished");
+                } else {
+                  throw new Exception(response.StatusMessage.ToString());
                 }
               } catch (Exception e) {
@@ -603 +606 @@
 
         Response snapShotResponse = executionEngineFacade.RequestSnapshot(jobId);
-        if (snapShotResponse.StatusMessage == ApplicationConstants.RESPONSE_JOB_IS_NOT_BEEING_CALCULATED) {
+        if (snapShotResponse.StatusMessage == ResponseStatus.RequestSnapshot_JobIsNotBeeingCalculated) {
           // job already finished
           Logger.Debug("HiveExperiment: Abort - GetLastResult(false)");
           response = executionEngineFacade.GetLastSerializedResult(jobId, false, false);
-          Logger.Debug("HiveExperiment: Abort - Server: " + response.StatusMessage + " success: " + response.Success);
+          Logger.Debug("HiveExperiment: Abort - Server: " + response.StatusMessage);
         } else {
           // server sent snapshot request to client
@@ -615 +618 @@
             Logger.Debug("HiveExperiment: Abort - GetLastResult(true)");
             response = executionEngineFacade.GetLastSerializedResult(jobId, false, true);
-            Logger.Debug("HiveExperiment: Abort - Server: " + response.StatusMessage + " success: " + response.Success);
+            Logger.Debug("HiveExperiment: Abort - Server: " + response.StatusMessage);
             retryCount++;
             // loop while
@@ -622 +625 @@
           } while (
             (retryCount < maxSnapshotRetries) && (
-            !response.Success ||
-            response.StatusMessage == ApplicationConstants.RESPONSE_JOB_RESULT_NOT_YET_HERE)
+            response.StatusMessage == ResponseStatus.GetLastSerializedResult_JobResultNotYetThere)
             );
         }
-        if (response.Success) {
+        if (response.StatusMessage == ResponseStatus.Ok) {
           LogMessage(jobId, "Snapshot polling successfull for job " + jobId);
           UpdateSnapshot(response);