Merge pull request #10 from AngelaFrancisca/feature/DRD-2

Fixed NPE on create dispatch DRD-2 #resolve
ist-dsi · Jul 16, 2020 · f4888e9 · f4888e9
2 parents 974eca3 + a520db8
commit f4888e9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/src/main/java/module/regulation/dispatch/domain/RegulationDispatchWorkflowMetaProcess.java b/src/main/java/module/regulation/dispatch/domain/RegulationDispatchWorkflowMetaProcess.java
@@ -85,6 +85,7 @@ protected RegulationDispatchWorkflowMetaProcess(String reference, LocalDate emis
         init(reference, emissionDate, emissor, description, regulationReference);
     }
 
+    @Atomic
     public static RegulationDispatchWorkflowMetaProcess createNewProcess(final CreateRegulationDispatchBean bean,
             final User user) {
         String reference = bean.getReference();

diff --git a/...main/java/module/regulation/dispatch/presentationTier/CreateRegulationDispatchAction.java b/...main/java/module/regulation/dispatch/presentationTier/CreateRegulationDispatchAction.java
@@ -78,7 +78,7 @@ public ActionForward createInvalid(final ActionMapping mapping, final ActionForm
         return forward("/module/regulation/dispatch/domain/RegulationDispatchWorkflowMetaProcess/create.jsp");
     }
 
-    @Atomic
+
     public ActionForward create(final ActionMapping mapping, final ActionForm form, final HttpServletRequest request,
             final HttpServletResponse response) {
         CreateRegulationDispatchBean bean = getRenderedObject("bean");
@@ -115,6 +115,7 @@ public ActionForward editInvalid(final ActionMapping mapping, final ActionForm f
             final HttpServletResponse response) {
         RegulationDispatchActivityInformation bean = getRenderedObject("bean");
         request.setAttribute("bean", bean);
+        request.setAttribute("dispatch", bean.getProcess());
 
         return forward("/module/regulation/dispatch/domain/RegulationDispatchWorkflowMetaProcess/edit.jsp");
     }