From 6a6c738f4e867e4a0f99db550fb449ab9e2bc0f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?= Date: Mon, 14 Sep 2009 20:23:42 +0200 Subject: [PATCH] ItEr26S07CUAsignacionGrupoRecursosAPlanificacionItEr25S07: Removing empty catch block --- .../allocation/ResourceAllocationModel.java | 22 ++++++++++++------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationModel.java index b5999a585..105a8f56f 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationModel.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationModel.java @@ -60,16 +60,22 @@ public class ResourceAllocationModel implements IResourceAllocationModel { @Override @Transactional(readOnly = true) public void setTask(Task task) { - try { - task = (Task) taskElementDAO.find(task.getId()); - reattachResourceAllocations(task.getResourceAllocations()); - hoursGroupDAO.save(task.getHoursGroup()); - reattachHoursGroup(task.getHoursGroup()); - reattachCriterions(task.getHoursGroup().getCriterions()); - + if (!taskElementDAO.exists(task.getId())) { this.task = task; - } catch (InstanceNotFoundException e) { + return; + } + this.task = findFromDB(task); + reattachResourceAllocations(this.task.getResourceAllocations()); + hoursGroupDAO.save(this.task.getHoursGroup()); + reattachHoursGroup(this.task.getHoursGroup()); + reattachCriterions(this.task.getHoursGroup().getCriterions()); + } + private Task findFromDB(Task task) { + try { + return (Task) taskElementDAO.find(task.getId()); + } catch (InstanceNotFoundException e) { + throw new RuntimeException(e); } }