Merge pull request #61 from FredPraca/fix/old-word

Fix NPE on thumbnailer choice

Author: makbn

src/main/java/io/github/makbn/jthumbnail/core/ThumbnailerManager.java

@@ -265,21 +265,24 @@ private ExecutionResult executeThumbnailers(String useMimeType, File input, File
         ExecutionResult result = ExecutionResult.failed(
                 new ThumbnailException("No suitable Thumbnailer has been " + "found for: " + input.getName()));
 
-        for (Thumbnailer thumbnailer : thumbnailers.get(useMimeType)) {
-            try {
-                if (thumbnailer instanceof ThumbnailerManager) continue;
-                thumbnailer.generateThumbnail(input, output, detectedMimeType);
-                result = ExecutionResult.success();
-                return result;
-            } catch (ThumbnailRuntimeException e) {
-                log.warn("pass runtime error to Thumbnailer");
-                result = ExecutionResult.failed(e);
-            } catch (ThumbnailException | IOException e) {
-                // This Thumbnailer apparently wasn't suitable, so try next
-                result = ExecutionResult.failed(e);
-            } catch (Exception e) {
-                log.error("unknown exception occurred!");
-                result = ExecutionResult.failed(e);
+        var thumbnailerList = thumbnailers.get(useMimeType);
+        if (thumbnailerList != null) {
+            for (Thumbnailer thumbnailer : thumbnailerList) {
+                try {
+                    if (thumbnailer instanceof ThumbnailerManager) continue;
+                    thumbnailer.generateThumbnail(input, output, detectedMimeType);
+                    result = ExecutionResult.success();
+                    return result;
+                } catch (ThumbnailRuntimeException e) {
+                    log.warn("pass runtime error to Thumbnailer");
+                    result = ExecutionResult.failed(e);
+                } catch (ThumbnailException | IOException e) {
+                    // This Thumbnailer apparently wasn't suitable, so try next
+                    result = ExecutionResult.failed(e);
+                } catch (Exception e) {
+                    log.error("unknown exception occurred!");
+                    result = ExecutionResult.failed(e);
+                }
             }
         }
         return result;

src/main/java/io/github/makbn/jthumbnail/core/thumbnailers/WordConverterThumbnailer.java

@@ -81,6 +81,7 @@ public String[] getAcceptedMIMETypes() {
             "application/vnd.openxmlformats-officedocument.wordprocessingml",
             "application/vnd.openxmlformats-officedocument.wordprocessingml.document",
             "application/wordperfect",
+            "application/msword"
         };
     }
 }