From 775f643e8051de438c4709395a9bba41e2f2f4b7 Mon Sep 17 00:00:00 2001 From: Manuel Rego Casasnovas Date: Thu, 29 Nov 2012 12:38:06 +0100 Subject: [PATCH] Fix issue deleting a project from the webservice A NPE was appearing because of the parent of a project is null. FEA: ItEr77S13AllowDeleteOrderElements --- .../org/libreplan/ws/orders/impl/OrderElementServiceREST.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libreplan-webapp/src/main/java/org/libreplan/ws/orders/impl/OrderElementServiceREST.java b/libreplan-webapp/src/main/java/org/libreplan/ws/orders/impl/OrderElementServiceREST.java index a2326e108..daf706cc7 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/ws/orders/impl/OrderElementServiceREST.java +++ b/libreplan-webapp/src/main/java/org/libreplan/ws/orders/impl/OrderElementServiceREST.java @@ -183,7 +183,8 @@ public class OrderElementServiceREST extends } OrderLineGroup parent = orderElement.getParent(); - if (!parent.isOrder() && parent.getChildren().size() == 1) { + if (parent != null && !parent.isOrder() + && parent.getChildren().size() == 1) { if (orderElementDAO.isAlreadyInUse(parent)) { return "You cannot remove the order element '" + orderElement.getName()