inteligr8/alfresco-transform-core
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-transform-core.git synced 2025-08-21 18:08:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

REPO-3439 LibreOffice now only creates the jodconverter on the 1st request so the correct timeout is used.

Browse Source
This commit is contained in:
Alan Davis
2018-04-16 17:23:43 +01:00
parent fd655e928e
commit f7f6525950
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
alfresco-docker-libreoffice/src/main/java/org/alfresco/transformer/LibreOfficeController.java
View File

@@ -71,11 +71,14 @@ public class LibreOfficeController extends AbstractTransformerController
logEnterpriseLicenseMessage();
logger.info("This transformer uses LibreOffice from The Document Foundation. See the license at https://www.libreoffice.org/download/license/ or in /libreoffice.txt");
logger.info("-------------------------------------------------------------------------------------------------------------------------------------------------------");
// TODO Remove this when we are happy that creating the jodconverter on the first transform is okay.
// setJodConverter(createJodConverter(null));
}
private static JodConverter createJodConverter(Long taskExecutionTimeout)
{
String timeout = taskExecutionTimeout <= 0 ? "120000" : taskExecutionTimeout.toString();
String timeout = taskExecutionTimeout == null || taskExecutionTimeout <= 0 ? "120000" : taskExecutionTimeout.toString();
JodConverterSharedInstance jodconverter = new JodConverterSharedInstance();
@@ -119,12 +122,11 @@ public class LibreOfficeController extends AbstractTransformerController
@Override
protected String version()
{
// This method is simply used to check the availability in the case of LibreOffice.
if (!jodconverter.isAvailable())
{
throw new TransformException(500, "LibreOffice is not yet available");
}
// TODO Remove this when we are happy that creating the jodconverter on the first transform is okay.
// if (!jodconverter.isAvailable())
// {
// throw new TransformException(500, "LibreOffice is not yet available");
// }
return "LibreOffice available";
}