From 83ca97e21c5a680ac9201695b4e68252268e691c Mon Sep 17 00:00:00 2001 From: Evan Harris Date: Sun, 11 Aug 2019 13:07:06 -0500 Subject: [PATCH] Improve error handling for jaudiotaggerParser artwork fetch --- .../org/airsonic/player/controller/CoverArtController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/airsonic-main/src/main/java/org/airsonic/player/controller/CoverArtController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/CoverArtController.java index c4266abb..167f2b7d 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/controller/CoverArtController.java +++ b/airsonic-main/src/main/java/org/airsonic/player/controller/CoverArtController.java @@ -292,12 +292,12 @@ public class CoverArtController implements LastModified { try { LOG.trace("Reading artwork from file {}", mediaFile); artwork = jaudiotaggerParser.getArtwork(mediaFile); + is = new ByteArrayInputStream(artwork.getBinaryData()); + mimeType = artwork.getMimeType(); } catch (Exception e) { LOG.debug("Could not read artwork from file {}", mediaFile); throw new RuntimeException(e); } - is = new ByteArrayInputStream(artwork.getBinaryData()); - mimeType = artwork.getMimeType(); } else { is = new FileInputStream(file); mimeType = StringUtil.getMimeType(FilenameUtils.getExtension(file.getName()));