From 5902ce032e940bced1bfb38f590afc2b56737abe Mon Sep 17 00:00:00 2001
From: luc <luc@debianluc>
Date: Mon, 19 Oct 2015 14:11:26 +0200
Subject: [PATCH] Corrected NullPointerException case when ImageIO reader is
 not found for image format.

---
 source/net/yacy/document/ImageParser.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/source/net/yacy/document/ImageParser.java b/source/net/yacy/document/ImageParser.java
index d10058dda..9a8d335c5 100644
--- a/source/net/yacy/document/ImageParser.java
+++ b/source/net/yacy/document/ImageParser.java
@@ -40,7 +40,6 @@ public class ImageParser {
         if (((filename.endsWith(".ico")) || (filename.endsWith(".bmp"))) && (bmpParser.isBMP(source))) {
             // parse image with BMP parser
             image = bmpParser.parse(source).getImage();
-            if (image == null) return null;
         } else if ((filename.endsWith(".ico")) && (icoParser.isICO(source))) {
             // parse image with ICO parser
             icoParser icoparser;
@@ -52,7 +51,6 @@ public class ImageParser {
     				ConcurrentLog.fine("IMAGEPARSER", "IMAGEPARSER.parse : could not parse image " + filename, e);
     			}
             }
-            if (image == null) return null;
         } else {
     		try {
     			image = ImageIO.read(new ByteArrayInputStream(source));
@@ -62,6 +60,9 @@ public class ImageParser {
     			}
     		}
         }
+        if (image == null) {
+        	return null;
+        }
 
         final int handle = image.hashCode();
         mediaTracker.addImage(image, handle);