Changeset 7409 for trunk

Timestamp:

01/25/12 13:20:28 (13 years ago)

Author:

ascheibe

Message:

#1766 fixed crash when the hive job manager can't deserialize a task

Location:

trunk/sources

Files:

• HeuristicLab.Clients.Hive.JobManager/3.3/Views/RefreshableHiveJobView.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

@@ -114 +114 @@
         logView.Content = null;
         refreshAutomaticallyCheckBox.Checked = false;
-        logView.Content = null;
         runCollectionViewHost.Content = null;
       } else {
@@ -302 +301 @@
     }
     private void Content_ExceptionOccured(object sender, EventArgs<Exception> e) {
-      throw e.Value;
+      if (InvokeRequired)
+        Invoke(new EventHandler<EventArgs<Exception>>(Content_ExceptionOccured), sender, e);
+      else {
+        //don't show the error dialog when downloading tasks, the HiveClient will throw an exception and the dialog will be shown then
+        if (sender.GetType() != typeof(ConcurrentTaskDownloader<ItemTask>) && sender.GetType() != typeof(TaskDownloader)) {
+          ErrorHandling.ShowErrorDialog(this, e.Value);
+        }
+      }
     }
     private void Content_StateLogListChanged(object sender, EventArgs e) {

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

@@ -342 +342 @@
 
     private void jobResultPoller_ExceptionOccured(object sender, EventArgs<Exception> e) {
-      OnExceptionOccured(e.Value);
+      OnExceptionOccured(sender, e.Value);
     }
     private void jobDownloader_ExceptionOccured(object sender, EventArgs<Exception> e) {
-      OnExceptionOccured(e.Value);
+      OnExceptionOccured(sender, e.Value);
     }
     public void UpdateTotalExecutionTime() {
@@ -445 +445 @@
 
     public event EventHandler<EventArgs<Exception>> ExceptionOccured;
-    private void OnExceptionOccured(Exception exception) {
+    private void OnExceptionOccured(object sender, Exception exception) {
       log.LogException(exception);
       var handler = ExceptionOccured;
-      if (handler != null) handler(this, new EventArgs<Exception>(exception));
+      if (handler != null) handler(sender, new EventArgs<Exception>(exception));
     }