RESMER-261: When printing s2s forms and validation errors exist those…

… validation errors are never displayed to the end user. Instead s2s pdf generation will be unable to create a pdf due to incomplete xml being input into the print process.
kuali · Dec 8, 2015 · 82b9eab · 82b9eab
1 parent 850b521
commit 82b9eab
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/...gen-impl/src/main/java/org/kuali/coeus/s2sgen/impl/generate/FormGeneratorServiceImpl.java b/...gen-impl/src/main/java/org/kuali/coeus/s2sgen/impl/generate/FormGeneratorServiceImpl.java
@@ -129,9 +129,9 @@ protected FormGenerationResult generateAndValidateForms(Forms forms,
             if(info==null) continue;
 			String namespace = info.getNameSpace();
             S2SFormGenerator s2sFormGenerator = s2SFormGeneratorService.getS2SGenerator(developmentProposal.getProposalNumber(),namespace);
-            auditErrors.addAll(s2sFormGenerator.getAuditErrors());
 			try {
 				XmlObject formObject = s2sFormGenerator.getFormObject(pdDoc);
+                auditErrors.addAll(s2sFormGenerator.getAuditErrors());
 				if (s2SValidatorService.validate(formObject, auditErrors, info.getFormName())) {
 					if (forms != null && attList != null) {
 						setFormObject(forms, formObject);

diff --git a/coeus-s2sgen-impl/src/main/java/org/kuali/coeus/s2sgen/impl/print/FormPrintServiceImpl.java b/coeus-s2sgen-impl/src/main/java/org/kuali/coeus/s2sgen/impl/print/FormPrintServiceImpl.java
@@ -367,9 +367,8 @@ protected PrintableResult getPDFStream(ProposalDevelopmentDocumentContract pdDoc
             FormMappingInfo info = formMappingService.getFormInfo(namespace,proposalNumber);
 			if(info==null) continue;
             S2SFormGenerator s2sFormGenerator = s2SFormGeneratorService.getS2SGenerator(proposalNumber,info.getNameSpace());
-            errors.addAll(s2sFormGenerator.getAuditErrors());
 			XmlObject formObject = s2sFormGenerator.getFormObject(pdDoc);
-
+			errors.addAll(s2sFormGenerator.getAuditErrors());
 			if (s2SValidatorService.validate(formObject, errors, info.getFormName()) && errors.isEmpty() && StringUtils.isNotBlank(info.getStyleSheet())) {
 			    String applicationXml = formObject.xmlText(s2SFormGeneratorService.getXmlOptionsPrefixes());
 			    String filteredApplicationXml = s2SDateTimeService.removeTimezoneFactor(applicationXml);

diff --git a/...s-s2sgen-impl/src/main/java/org/kuali/coeus/s2sgen/impl/print/S2SPrintingServiceImpl.java b/...s-s2sgen-impl/src/main/java/org/kuali/coeus/s2sgen/impl/print/S2SPrintingServiceImpl.java
@@ -219,7 +219,7 @@ protected boolean isPdfGoodToMerge(byte[] pdfBytes) {
             return true;
         }
         catch (IOException e) {
-            return false;
+            throw new S2SException(e);
         }
     }