From dcb32eb73fd925d07ffe2b6129bf4dc24147171b Mon Sep 17 00:00:00 2001 From: David Edwards Date: Tue, 7 Apr 2020 20:23:33 +0100 Subject: [PATCH] Revert "ATS-702 Remove incorrect error handling" This reverts commit e5516473274f995fd493193b215229af913a9590. --- .../alfresco/transformer/AIOController.java | 25 ++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/src/main/java/org/alfresco/transformer/AIOController.java b/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/src/main/java/org/alfresco/transformer/AIOController.java index 691041a3..e7ca3684 100644 --- a/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/src/main/java/org/alfresco/transformer/AIOController.java +++ b/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/src/main/java/org/alfresco/transformer/AIOController.java @@ -98,7 +98,16 @@ public class AIOController extends AbstractTransformerController final String transform = getTransformerName(sourceFile, sourceMimetype, targetMimetype, transformOptions); transformOptions.put(AllInOneTransformer.TRANSFORM_NAME_PARAMETER, transform); - transformer.transform(sourceFile, targetFile, sourceMimetype, targetMimetype, transformOptions); + + try + { + transformer.transform(sourceFile, targetFile, sourceMimetype, targetMimetype, transformOptions); + } + catch (Exception e) + { + logger.error(e.getMessage(), e); + } + } @@ -118,8 +127,16 @@ public class AIOController extends AbstractTransformerController Map parameters = new HashMap<>(); parameters.put(AllInOneTransformer.TRANSFORM_NAME_PARAMETER, "misc"); parameters.put(SOURCE_ENCODING, "UTF-8"); - transformer.transform(sourceFile, targetFile, MIMETYPE_HTML, - MIMETYPE_TEXT_PLAIN, parameters); + try + { + transformer.transform(sourceFile, targetFile, MIMETYPE_HTML, + MIMETYPE_TEXT_PLAIN, parameters); + } + catch(Exception e) + { + logger.error(e.getMessage(), e); + } + } }; } @@ -147,6 +164,8 @@ public class AIOController extends AbstractTransformerController final File sourceFile = createSourceFile(request, sourceMultipartFile); final File targetFile = createTargetFile(request, targetFilename); + // TODO Currently sourceMimetype and targetMimetype could be an empty string how does this affect getting the name? + // not all controllers take these from the request? Do requests intended for these transforms provide these? final String transform = getTransformerName(sourceFile, sourceMimetype, targetMimetype, transformOptions); transformOptions.put(AllInOneTransformer.TRANSFORM_NAME_PARAMETER, transform);