Changeset 6369 for branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive/3.4/HiveService.cs

Timestamp:

06/06/11 17:49:27 (13 years ago)

Author:

cneumuel

Message:

#1233

• added consideration of appointments in heartbeats
• code cleanup

File:

• branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive/3.4/HiveService.cs (modified) (3 diffs)

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive/3.4/HiveService.cs

@@ -317 +317 @@
       return trans.UseTransaction(() => {
         foreach (Guid guid in pluginIds) {
-          List<PluginData> pluginData = dao.GetPluginDatas(x => x.PluginId == guid).ToList();
-          if (pluginData != null) {
-            pluginDatas.AddRange(pluginData);
-          } else {
-            //ignore ? 
-          }
+          pluginDatas.AddRange(dao.GetPluginDatas(x => x.PluginId == guid).ToList());
         }
         return pluginDatas;
@@ -420 +415 @@
 
     public void TriggerLifecycle(bool force) {
-      // use a serializable transaction here to ensure not two threads execute this simultaniously (locking would not work since IIS may use multiple AppDomains)
+      // use a serializable transaction here to ensure not two threads execute this simultaniously (mutex-lock would not work since IIS may use multiple AppDomains)
       trans.UseTransaction(() => {
         DateTime lastCleanup = dao.GetLastCleanup();
@@ -444 +439 @@
 
       if (includeParent) jobs.Add(GetJob(parentJobId.Value));
-
       return jobs;
     }
-
     #endregion