Merge remote-tracking branch 'origin/pr/1152'

2019-07-09 13:08:17 -06:00
parent 0bc15b404e 50b3fd382c
commit 0dd16c2cd8
1 changed files with 3 additions and 3 deletions
@@ -628,10 +628,10 @@ public class CoverArtController implements LastModified {
            try {
                in = getImageInputStreamForVideo(mediaFile, width, height, offset);
                BufferedImage result = ImageIO.read(in);
-                if (result == null) {
-                    throw new NullPointerException();
+                if (result != null) {
+                    return result;
                }
-                return result;
+                LOG.warn("Failed to process cover art for " + mediaFile + ": {}", result);
            } catch (Throwable x) {
                LOG.warn("Failed to process cover art for " + mediaFile + ": " + x, x);
            } finally {