Handle nulls when processing cover art better

This expands on commit d4487a07a0fcacea1544d61c79a380f2e9bf3087.

Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
master
Evan Harris 5 years ago committed by Andrew DeMaria
parent 5c1451b904
commit 1b28d2c2fe
No known key found for this signature in database
GPG Key ID: 0A3F5E91F8364EDF
  1. 17
      airsonic-main/src/main/java/org/airsonic/player/controller/CoverArtController.java

@ -380,13 +380,22 @@ public class CoverArtController implements LastModified {
public BufferedImage createImage(int size) {
if (coverArt != null) {
InputStream in = null;
String reason = null;
try {
in = getImageInputStream(coverArt);
BufferedImage bimg = ImageIO.read(in);
if (bimg != null) {
return scale(bimg, size, size);
if (in == null) {
reason = "getImageInputStream";
}
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) {
LOG.warn("Failed to process cover art " + coverArt + ": " + x, x);
} finally {

Loading…
Cancel
Save