From 97222ebb43b65078a09aedb498c29980c32d1fe7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacobo=20Aragunde=20P=C3=A9rez?= Date: Wed, 11 Aug 2010 19:11:21 +0200 Subject: [PATCH] ItEr60S17CambiosPantallaVistaEmpresa: Corrected some validation code which hid run-time errors. --- .../web/workreports/WorkReportCRUDController.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java index a9c60729b..50c7b1f93 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java @@ -236,7 +236,9 @@ public class WorkReportCRUDController extends GenericForwardComposer implements } catch (ValidationException e) { showInvalidValues(e); } catch (Exception e) { - showInvalidProperty(); + if(!showInvalidProperty()) { + throw new RuntimeException(e); + } } return false; } @@ -258,16 +260,17 @@ public class WorkReportCRUDController extends GenericForwardComposer implements } } - private void showInvalidProperty() { + private boolean showInvalidProperty() { if (getWorkReport() != null) { if (!validateWorkReport()) - return; + return true; for (WorkReportLine workReportLine : getWorkReport() .getWorkReportLines()) { if (!validateWorkReportLine(workReportLine)) - return; + return true; } } + return false; } /**