Changeset 7409


Ignore:
Timestamp:
01/25/12 13:20:28 (9 years ago)
Author:
ascheibe
Message:

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

Location:
trunk/sources
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/sources/HeuristicLab.Clients.Hive.JobManager/3.3/Views/RefreshableHiveJobView.cs

    r7259 r7409  
    114114        logView.Content = null;
    115115        refreshAutomaticallyCheckBox.Checked = false;
    116         logView.Content = null;
    117116        runCollectionViewHost.Content = null;
    118117      } else {
     
    302301    }
    303302    private void Content_ExceptionOccured(object sender, EventArgs<Exception> e) {
    304       throw e.Value;
     303      if (InvokeRequired)
     304        Invoke(new EventHandler<EventArgs<Exception>>(Content_ExceptionOccured), sender, e);
     305      else {
     306        //don't show the error dialog when downloading tasks, the HiveClient will throw an exception and the dialog will be shown then
     307        if (sender.GetType() != typeof(ConcurrentTaskDownloader<ItemTask>) && sender.GetType() != typeof(TaskDownloader)) {
     308          ErrorHandling.ShowErrorDialog(this, e.Value);
     309        }
     310      }
    305311    }
    306312    private void Content_StateLogListChanged(object sender, EventArgs e) {
  • trunk/sources/HeuristicLab.Clients.Hive/3.3/RefreshableJob.cs

    r7259 r7409  
    342342
    343343    private void jobResultPoller_ExceptionOccured(object sender, EventArgs<Exception> e) {
    344       OnExceptionOccured(e.Value);
     344      OnExceptionOccured(sender, e.Value);
    345345    }
    346346    private void jobDownloader_ExceptionOccured(object sender, EventArgs<Exception> e) {
    347       OnExceptionOccured(e.Value);
     347      OnExceptionOccured(sender, e.Value);
    348348    }
    349349    public void UpdateTotalExecutionTime() {
     
    445445
    446446    public event EventHandler<EventArgs<Exception>> ExceptionOccured;
    447     private void OnExceptionOccured(Exception exception) {
     447    private void OnExceptionOccured(object sender, Exception exception) {
    448448      log.LogException(exception);
    449449      var handler = ExceptionOccured;
    450       if (handler != null) handler(this, new EventArgs<Exception>(exception));
     450      if (handler != null) handler(sender, new EventArgs<Exception>(exception));
    451451    }
    452452
Note: See TracChangeset for help on using the changeset viewer.