inteligr8/alfresco-transform-core
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-transform-core.git synced 2025-05-26 17:24:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

There is an NPE in libreoffice when the external files are not present and debug is enabled (#218)

Browse Source 
ATS-714: Fix NPE in libreoffice executor when the external files are not present and debug is enabled
This commit is contained in:
eknizat 2020-04-15 13:37:33 +01:00 committed by GitHub
parent 6c7a2246e3
commit 4a46948648
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
alfresco-transform-libreoffice/alfresco-transform-libreoffice/src/main/java/org/alfresco/transformer/executors/JodConverterSharedInstance.java
View File

@ -438,9 +438,19 @@ public class JodConverterSharedInstance implements JodConverter
} }
File[] matchingFiles = searchRoot.listFiles((dir, name) -> name.startsWith("soffice")); File[] matchingFiles = searchRoot.listFiles((dir, name) -> name.startsWith("soffice"));
if (matchingFiles == null)
{
return results;
}
results.addAll(asList(matchingFiles)); results.addAll(asList(matchingFiles));
for (File dir : requireNonNull(searchRoot.listFiles(File::isDirectory))) File[] matchingDirectories = searchRoot.listFiles(File::isDirectory);
if (matchingDirectories == null)
{
return results;
}
for (File dir : requireNonNull(matchingDirectories))
{ {
findSofficePrograms(dir, results, currentRecursionDepth + 1, maxRecursionDepth); findSofficePrograms(dir, results, currentRecursionDepth + 1, maxRecursionDepth);
} }