Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,8 @@ class ExternalApiController implements EventPublisher {
} catch (SAXException e){
return render(status: 400, text: "Response validation failed: ${e.message}")
} catch ( Exception e ) {
log.error("Exception receiving ISO message",e);
log.error("Exception while handling incoming ISO message",e);
return render(status: 500, text: "Error: ${e.getLocalizedMessage()}");
} finally {
log.debug("ExternalApiController::iso18626 exiting cleanly");
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ class ConfirmationMessageService {

Iso18626MessageValidationService iso18626MessageValidationService
JAXBContext context = JAXBContext.newInstance(ObjectFactory.class)
Marshaller marshaller = null

def confirmationMessageReadable(def confirmationMessage) {
StringWriter sw = new StringWriter()
Expand All @@ -25,11 +24,12 @@ class ConfirmationMessageService {
}

Marshaller getMarshaller() {
if(marshaller == null){
marshaller = context.createMarshaller()
marshaller.setProperty(Marshaller.JAXB_SCHEMA_LOCATION, Iso18626Constants.SCHEMA_LOCATION)
marshaller.setProperty("com.sun.xml.bind.namespacePrefixMapper", new IllNamespacePrefixMapper())
}
Marshaller marshaller;

marshaller = context.createMarshaller()
marshaller.setProperty(Marshaller.JAXB_SCHEMA_LOCATION, Iso18626Constants.SCHEMA_LOCATION)
marshaller.setProperty("com.sun.xml.bind.namespacePrefixMapper", new IllNamespacePrefixMapper())

return marshaller
}

Expand Down
Loading