improved converter lookup

Author: car031

logicaldoc-core/src/main/java/com/logicaldoc/core/conversion/FormatConverterManager.java

@@ -448,15 +448,13 @@ public FormatConverter getConverter(String inFileName, String outFileName) {
 			log.warn("No format converter for file {}", inFileName);
 
 		// Get the first available and enabled converter
-		FormatConverter converter = formatConverters != null
-				? formatConverters.stream().filter(c -> c.isEnabled()).findFirst().orElse(null)
-				: null;
+		FormatConverter converter = formatConverters.stream().filter(c -> c.isEnabled()).findFirst().orElse(null);
 
 		// Check if a special binding is configured and points to an enabled
 		// converter
 		String currentConverter = config.getProperty("converter." + inOutkey);
 
-		if (StringUtils.isNotEmpty(currentConverter) && formatConverters != null)
+		if (StringUtils.isNotEmpty(currentConverter) && formatConverters.size() > 1)
 			converter = formatConverters.stream()
 					.filter(conv -> conv.getClass().getName().equals(currentConverter) && conv.isEnabled()).findFirst()
 					.orElse(null);