Changeset 7222 for trunk/sources

Timestamp:

12/21/11 16:57:14 (12 years ago)

Author:

ascheibe

Message:

#1672 don't crash if there are no child hive tasks

File:

• trunk/sources/HeuristicLab.Clients.Hive/3.3/HiveTasks/OptimizerHiveTask.cs (modified) (8 diffs)

trunk/sources/HeuristicLab.Clients.Hive/3.3/HiveTasks/OptimizerHiveTask.cs

@@ -140 +140 @@
             }
           }
-        } finally { childHiveTasksLock.ExitWriteLock(); }
+        }
+        finally { childHiveTasksLock.ExitWriteLock(); }
       }
     }
@@ -155 +156 @@
             }
           }
-        } finally { childHiveTasksLock.ExitWriteLock(); }
+        }
+        finally { childHiveTasksLock.ExitWriteLock(); }
       }
     }
@@ -165 +167 @@
             this.childHiveTasks.Remove(this.GetChildByOptimizer(item.Value));
           }
-        } finally { childHiveTasksLock.ExitWriteLock(); }
+        }
+        finally { childHiveTasksLock.ExitWriteLock(); }
       }
     }
@@ -175 +178 @@
             this.childHiveTasks.Remove(this.GetChildByOptimizer(item.Value));
           }
-        } finally { childHiveTasksLock.ExitWriteLock(); }
+        }
+        finally { childHiveTasksLock.ExitWriteLock(); }
       }
     }
@@ -197 +201 @@
       }
 
-      childHiveTasksLock.EnterReadLock();
-      OptimizerHiveTask child = (OptimizerHiveTask)this.ChildHiveTasks.Single(j => j.Task.Id == childTaskId);
-      try {
-        if (!optimizerTask.ComputeInParallel) {
+      IEnumerable<HiveTask> childs = this.ChildHiveTasks.Where(j => j.Task.Id == childTaskId);
+      //TODO: in very rare cases childs is empty. This shouldn't be the case and should be further investigated. 
+      if (childs.Count() > 0) {
+        OptimizerHiveTask child = childs.First() as OptimizerHiveTask;
+
+        if (child != null && !optimizerTask.ComputeInParallel) {
           child.syncTasksWithOptimizers = false;
           child.ItemTask = optimizerTask;
           child.syncTasksWithOptimizers = true;
         }
-      } finally { childHiveTasksLock.ExitReadLock(); }
+      }
+
       syncTasksWithOptimizers = true;
     }
@@ -267 +274 @@
           child.SetIndexInParentOptimizerList(this);
         }
-      } finally { childHiveTasksLock.ExitReadLock(); }
+      }
+      finally { childHiveTasksLock.ExitReadLock(); }
     }
 
@@ -337 +345 @@
         }
         return null;
-      } finally { childHiveTasksLock.ExitReadLock(); }
+      }
+      finally { childHiveTasksLock.ExitReadLock(); }
     }
 
@@ -348 +357 @@
         }
         return null;
-      } finally { childHiveTasksLock.ExitReadLock(); }
+      }
+      finally { childHiveTasksLock.ExitReadLock(); }
     }