Changeset 7782

Timestamp:

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

Author:

ascheibe

Message:

#1722 fixed a NullReferenceException in Hive JobManager

Location:

trunk/sources

Files:

• HeuristicLab.Clients.Hive.JobManager/3.3/Views/RefreshableHiveJobView.cs (modified) (5 diffs)
• HeuristicLab.Clients.Hive/3.3/HiveTasks/OptimizerHiveTask.cs (modified) (2 diffs)
• HeuristicLab.Clients.Hive/3.3/RefreshableJob.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Clients.Hive.JobManager/3.3/Views/RefreshableHiveJobView.cs

@@ -69 +69 @@
       Content.IsAllowedPrivilegedChanged += new EventHandler(Content_IsAllowedPrivilegedChanged);
       Content.Loaded += new EventHandler(Content_Loaded);
+      Content.TaskReceived += new EventHandler(Content_TaskReceived);
     }
 
@@ -83 +84 @@
       Content.ExecutionTimeChanged -= new EventHandler(Content_ExecutionTimeChanged);
       Content.Loaded -= new EventHandler(Content_Loaded);
+      Content.TaskReceived -= new EventHandler(Content_TaskReceived);
       base.DeregisterContentEvents();
     }
@@ -167 +169 @@
 
     #region Content Events
+    void Content_TaskReceived(object sender, EventArgs e) {
+      runCollectionViewHost.Content = GetAllRunsFromJob(Content);
+    }
+
     private void HiveTasks_ItemsAdded(object sender, CollectionItemsChangedEventArgs<HiveTask> e) {
       if (InvokeRequired)
         Invoke(new CollectionItemsChangedEventHandler<HiveTask>(HiveTasks_ItemsAdded), sender, e);
       else {
-        foreach (HiveTask t in e.Items) {
-          t.TaskStateChanged += new EventHandler(HiveTask_TaskStateChanged);
-        }
         SetEnabledStateOfControls();
       }
@@ -182 +185 @@
         Invoke(new CollectionItemsChangedEventHandler<HiveTask>(HiveTasks_ItemsRemoved), sender, e);
       else {
-        foreach (HiveTask t in e.Items) {
-          t.TaskStateChanged -= new EventHandler(HiveTask_TaskStateChanged);
-        }
         SetEnabledStateOfControls();
       }
@@ -193 +193 @@
         Invoke(new CollectionItemsChangedEventHandler<HiveTask>(HiveTasks_CollectionReset), sender, e);
       else {
-        foreach (HiveTask t in e.Items) {
-          t.TaskStateChanged -= new EventHandler(HiveTask_TaskStateChanged);
-        }
-        SetEnabledStateOfControls();
-      }
-    }
-
-    void HiveTask_TaskStateChanged(object sender, EventArgs e) {
-      runCollectionViewHost.Content = GetAllRunsFromJob(Content);
+        SetEnabledStateOfControls();
+      }
     }
 

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