Changeset 7782 for trunk/sources/HeuristicLab.Clients.Hive

Timestamp:

05/04/12 17:57:40 (12 years ago)

Author:

ascheibe

Message:

#1722 fixed a NullReferenceException in Hive JobManager

Location:

trunk/sources/HeuristicLab.Clients.Hive/3.3

Files:

• HiveTasks/OptimizerHiveTask.cs (modified) (2 diffs)
• RefreshableJob.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Clients.Hive/3.3/HiveTasks/OptimizerHiveTask.cs

@@ -31 +31 @@
 namespace HeuristicLab.Clients.Hive {
   public class OptimizerHiveTask : HiveTask<OptimizerTask> {
+
+    Object batchRunLocker = new Object();
 
     #region Constructors and Cloning
@@ -224 +226 @@
         batchRun.Optimizer = (IOptimizer)optimizerTask.Item; // only set the first optimizer as Optimizer. if every time the Optimizer would be set, the runs would be cleared each time
       }
-      foreach (IRun run in optimizerTask.Item.Runs) {
-        if (!batchRun.Runs.Contains(run)) {
-          run.Name = GetNewRunName(run, batchRun.Runs);
-          batchRun.Runs.Add(run);
+      lock (batchRunLocker) {
+        foreach (IRun run in optimizerTask.Item.Runs) {
+          if (!batchRun.Runs.Contains(run)) {
+            run.Name = GetNewRunName(run, batchRun.Runs);
+            batchRun.Runs.Add(run);
+          }
         }
       }

trunk/sources/HeuristicLab.Clients.Hive/3.3/RefreshableJob.cs

@@ -316 +316 @@
       UpdateStatistics();
       OnStateLogListChanged();
+      OnTaskReceived();
     }
 
@@ -469 +470 @@
       if (handler != null) handler(this, EventArgs.Empty);
     }
+    public event EventHandler TaskReceived;
+    protected virtual void OnTaskReceived() {
+      var handler = TaskReceived;
+      if (handler != null) handler(this, EventArgs.Empty);
+    }
     #endregion