Changeset 15478

Timestamp:

11/17/17 13:21:34 (7 years ago)

Author:

jkarder

Message:

#2846:

• only swallow a potential NullReferenceException while jobs are added
• removed redundant check in OnContentChanged

Location:

trunk/sources

Files:

• HeuristicLab.Clients.Hive.JobManager/3.3/Views/HiveJobManagerView.cs (modified) (1 diff)
• HeuristicLab.Clients.Hive/3.3/HiveClient.cs (modified) (1 diff)

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

@@ -67 +67 @@
       } else {
         hiveExperimentListView.Content = Content.Jobs;
-        if (Content != null) {
-          try {
-            await System.Threading.Tasks.Task.Run(() => Content.Refresh());
-          } catch (Exception ex) {
-            HandleServiceException(ex);
-          }
+        try {
+          await System.Threading.Tasks.Task.Run(() => Content.Refresh());
+        } catch (Exception ex) {
+          HandleServiceException(ex);
         }
       }

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

@@ -96 +96 @@
         var jobsLoaded = HiveServiceLocator.Instance.CallHiveService<IEnumerable<Job>>(s => s.GetJobs());
 
-        foreach (var j in jobsLoaded) {
-          jobs.Add(new RefreshableJob(j));
-        }
-      } catch (NullReferenceException) {
-        // jobs was set to null during ClearHiveClient
+        try {
+          foreach (var j in jobsLoaded) {
+            jobs.Add(new RefreshableJob(j));
+          }
+        } catch (NullReferenceException) {
+          // jobs was set to null during ClearHiveClient
+        }
       } catch {
         jobs = null;