Changeset 8206 for branches/GP-MoveOperators/HeuristicLab.Clients.Hive/3.3/HiveClient.cs

Timestamp:

07/03/12 16:46:35 (12 years ago)

Author:

gkronber

Message:

#1847: merged r8084:8205 from trunk into GP move operators branch

Location:

branches/GP-MoveOperators

Files:

• . (modified) (1 prop)
• HeuristicLab.Clients.Hive/3.3/HiveClient.cs (modified) (6 diffs)

branches/GP-MoveOperators/HeuristicLab.Clients.Hive/3.3/HiveClient.cs

@@ -258 +258 @@
     private void UploadJob(RefreshableJob refreshableJob, CancellationToken cancellationToken) {
       try {
+        refreshableJob.IsProgressing = true;
         refreshableJob.Progress = new Progress("Connecting to server...");
-        refreshableJob.IsProgressing = true;
-
         IEnumerable<string> resourceNames = ToResourceNameList(refreshableJob.Job.ResourceNames);
         var resourceIds = new List<Guid>();
@@ -317 +316 @@
       finally {
         refreshableJob.IsProgressing = false;
+        refreshableJob.Progress.Finish();
       }
     }
@@ -351 +351 @@
     /// </summary>
     /// <param name="parentHiveTask">shall be null if its the root task</param>
-    private void UploadTaskWithChildren(IProgress progress, HiveTask hiveTask, HiveTask parentHiveTask, IEnumerable<Guid> groups, int[] taskCount, int totalJobCount, Guid configPluginId, Guid jobId, ILog log, bool isPrivileged, CancellationToken cancellationToken) {
+    private void UploadTaskWithChildren(Progress progress, HiveTask hiveTask, HiveTask parentHiveTask, IEnumerable<Guid> groups, int[] taskCount, int totalJobCount, Guid configPluginId, Guid jobId, ILog log, bool isPrivileged, CancellationToken cancellationToken) {
       taskUploadSemaphore.WaitOne();
       bool semaphoreReleased = false;
@@ -427 +427 @@
     public static void LoadJob(RefreshableJob refreshableJob) {
       var hiveExperiment = refreshableJob.Job;
+      refreshableJob.IsProgressing = true;
       refreshableJob.Progress = new Progress();
 
       try {
-        refreshableJob.IsProgressing = true;
         int totalJobCount = 0;
         IEnumerable<LightweightTask> allTasks;
@@ -472 +472 @@
       finally {
         refreshableJob.IsProgressing = false;
+        refreshableJob.Progress.Finish();
       }
     }
@@ -493 +494 @@
     private static IEnumerable<string> ToResourceNameList(string resourceNames) {
       if (!string.IsNullOrEmpty(resourceNames)) {
-        return resourceNames.Split(';');
+        return resourceNames.Split(new[] { ';' }, StringSplitOptions.RemoveEmptyEntries);
       } else {
         return new List<string>();