Changeset 5535 for branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive

Timestamp:

02/22/11 13:54:31 (14 years ago)

Author:

cneumuel

Message:

#1233

• merged changes in hive experiment manager from 3.3 (more reliable and efficient downloading of jobs)

File:

• branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive/3.4/HiveService.cs (modified) (2 diffs)

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive/3.4/HiveService.cs

@@ -388 +388 @@
       var jobs = new List<Job>(dao.GetJobs(x => parentJobId == null ? !x.ParentJobId.HasValue : x.ParentJobId.Value == parentJobId));
 
-      if (includeParent) {
-        jobs.Add(GetJob(parentJobId.Value));
-      }
-
       if (recursive) {
         var childs = new List<Job>();
@@ -399 +395 @@
         jobs.AddRange(childs);
       }
+
+      if (includeParent) jobs.Add(GetJob(parentJobId.Value));
+
       return jobs;
     }