From 14ba92e0499edd6ca1a85f80008a4cc1172acaae Mon Sep 17 00:00:00 2001
From: Manuel Rego Casasnovas <rego@igalia.com>
Date: Tue, 26 Jun 2012 12:38:32 +0200
Subject: [PATCH] Bug #1466: Fix NPE when there are milestones in the planning

FEA: ItEr76S04BugFixing
---
 .../libreplan/web/planner/TaskElementPredicate.java    | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementPredicate.java b/libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementPredicate.java
index 6bc387153..0bc3de0e3 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementPredicate.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementPredicate.java
@@ -25,6 +25,7 @@ import java.util.Set;
 
 import org.apache.commons.lang.StringUtils;
 import org.libreplan.business.labels.entities.Label;
+import org.libreplan.business.orders.entities.OrderElement;
 import org.libreplan.business.planner.entities.GenericResourceAllocation;
 import org.libreplan.business.planner.entities.ResourceAllocation;
 import org.libreplan.business.planner.entities.SpecificResourceAllocation;
@@ -178,11 +179,16 @@ public class TaskElementPredicate implements IPredicate {
 
     private boolean existLabelInTaskElement(Label filterLabel,
             TaskElement taskElement) {
+        OrderElement orderElement = taskElement.getOrderElement();
+        if (orderElement ==  null) {
+            return false;
+        }
+
         Set<Label> labels;
         if (ignoreLabelsInheritance) {
-            labels = taskElement.getOrderElement().getLabels();
+            labels = orderElement.getLabels();
         } else {
-            labels = taskElement.getOrderElement().getAllLabels();
+            labels = orderElement.getAllLabels();
         }
         for (Label label : labels) {
             if (label.getId().equals(filterLabel.getId())) {