Merge remote-tracking branch 'origin/pr/1152'
This commit is contained in:
@@ -628,10 +628,10 @@ public class CoverArtController implements LastModified {
|
|||||||
try {
|
try {
|
||||||
in = getImageInputStreamForVideo(mediaFile, width, height, offset);
|
in = getImageInputStreamForVideo(mediaFile, width, height, offset);
|
||||||
BufferedImage result = ImageIO.read(in);
|
BufferedImage result = ImageIO.read(in);
|
||||||
if (result == null) {
|
if (result != null) {
|
||||||
throw new NullPointerException();
|
return result;
|
||||||
}
|
}
|
||||||
return result;
|
LOG.warn("Failed to process cover art for " + mediaFile + ": {}", result);
|
||||||
} catch (Throwable x) {
|
} catch (Throwable x) {
|
||||||
LOG.warn("Failed to process cover art for " + mediaFile + ": " + x, x);
|
LOG.warn("Failed to process cover art for " + mediaFile + ": " + x, x);
|
||||||
} finally {
|
} finally {
|
||||||
|
|||||||
Reference in New Issue
Block a user