From 7cc37a77ae8025f9c1bb597285abbe2c43232f92 Mon Sep 17 00:00:00 2001
From: Diego Pino Garcia <dpino@igalia.com>
Date: Mon, 15 Nov 2010 17:44:29 +0100
Subject: [PATCH] Fix bug getAllChildrenAssociatedTaskElements() should not
 contain null elements

FEA: ItEr63OTS06MonteCarlo
---
 .../org/navalplanner/business/orders/entities/Order.java | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/Order.java b/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/Order.java
index 74a8eda16..0bb85e00b 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/Order.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/Order.java
@@ -269,10 +269,13 @@ public class Order extends OrderLineGroup {
     public List<TaskElement> getAllChildrenAssociatedTaskElements() {
         List<TaskElement> result = new ArrayList<TaskElement>();
 
-        List<OrderElement> children = getAllChildren();
-        for (OrderElement orderElement : children) {
-            result.add(orderElement.getAssociatedTaskElement());
+        for (OrderElement orderElement : getAllChildren()) {
+            TaskElement taskElement = orderElement.getAssociatedTaskElement();
+            if (taskElement != null) {
+                result.add(taskElement);
+            }
         }
+        Validate.noNullElements(result);
 
         return result;
     }