MightyPork/airsonic-custom
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Handle nulls when processing cover art better

Browse Source 
This expands on commit d4487a07a0fcacea1544d61c79a380f2e9bf3087.

Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
This commit is contained in:
Evan Harris
2019-10-05 20:06:09 -06:00
committed by Andrew DeMaria
parent 5c1451b904
commit 1b28d2c2fe
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
airsonic-main/src/main/java/org/airsonic/player/controller/CoverArtController.java
+13 -4
View File
@@ -380,13 +380,22 @@ public class CoverArtController implements LastModified {
public BufferedImage createImage(int size) { public BufferedImage createImage(int size) {
if (coverArt != null) { if (coverArt != null) {
InputStream in = null; InputStream in = null;
String reason = null;
try { try {
in = getImageInputStream(coverArt); in = getImageInputStream(coverArt);
BufferedImage bimg = ImageIO.read(in); if (in == null) {
if (bimg != null) { reason = "getImageInputStream";
return scale(bimg, size, size);
} }
LOG.warn("Failed to process cover art " + coverArt + ": {}", bimg); else {
BufferedImage bimg = ImageIO.read(in);
if (bimg == null) {
reason = "ImageIO.read";
}
else {
return scale(bimg, size, size);
}
}
LOG.warn("Failed to process cover art " + coverArt + ": " + reason + " failed");
} catch (Throwable x) { } catch (Throwable x) {
LOG.warn("Failed to process cover art " + coverArt + ": " + x, x); LOG.warn("Failed to process cover art " + coverArt + ": " + x, x);
} finally { } finally {