Changeset 15419 for trunk/sources/HeuristicLab.Clients.Hive.JobManager/3.3/Views/HiveJobManagerView.cs

Timestamp:

10/13/17 14:21:09 (7 years ago)

Author:

pfleck

Message:

#2846: Fixed uncaught ObjectDisposedException in HiveJobManagerView.

• Caught a potential NullReferenceException in the HiveClient when ClearHiveClient is called asynchronous.
• Use Task.Run for HiveClient.Refresh instead of Begin/EndInvoke.
• Use await with try-catch to marshal back any uncaught exceptions back to the UI-thread where the exception is displayed instead of HL crashing.

File:

• trunk/sources/HeuristicLab.Clients.Hive.JobManager/3.3/Views/HiveJobManagerView.cs (modified) (3 diffs)

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

@@ -61 +61 @@
     }
 
-    protected override void OnContentChanged() {
+    protected async override void OnContentChanged() {
       base.OnContentChanged();
       if (Content == null) {
@@ -67 +67 @@
       } else {
         hiveExperimentListView.Content = Content.Jobs;
-        if (Content != null)
-          Content.RefreshAsync(new Action<Exception>((Exception ex) => HandleServiceException(ex)));
+        if (Content != null) {
+          try {
+            await System.Threading.Tasks.Task.Run(() => Content.Refresh());
+          } catch (Exception ex) {
+            HandleServiceException(ex);
+          }
+        }
       }
     }
@@ -98 +103 @@
     }
 
-    private void refreshButton_Click(object sender, EventArgs e) {
-      Content.RefreshAsync(new Action<Exception>((Exception ex) => HandleServiceException(ex)));
+    private async void refreshButton_Click(object sender, EventArgs e) {
+      try {
+        await System.Threading.Tasks.Task.Run(() => Content.Refresh());
+      } catch (Exception ex) {
+        HandleServiceException(ex);
+      }
     }