svn commit: r881276 - /lucene/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/image/ImageParser.java

[jukka]

Author: jukka
Date: Tue Nov 17 13:30:27 2009
New Revision: 881276

URL: http://svn.apache.org/viewvc?rev=881276&view=rev
Log:
TIKA-326: Map javax.imageio.IIOException to TikaException

Modified:
    
lucene/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/image/ImageParser.java

Modified: 
lucene/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/image/ImageParser.java
URL: 
http://svn.apache.org/viewvc/lucene/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/image/ImageParser.java?rev=881276&r1=881275&r2=881276&view=diff
==============================================================================
--- 
lucene/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/image/ImageParser.java
 (original)
+++ 
lucene/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/image/ImageParser.java
 Tue Nov 17 13:30:27 2009
@@ -20,6 +20,7 @@
 import java.io.InputStream;
 import java.util.Iterator;
 
+import javax.imageio.IIOException;
 import javax.imageio.ImageIO;
 import javax.imageio.ImageReader;
 
@@ -40,15 +41,19 @@
             throws IOException, SAXException, TikaException {
         String type = metadata.get(Metadata.CONTENT_TYPE);
         if (type != null) {
-            Iterator<ImageReader> iterator =
-                ImageIO.getImageReadersByMIMEType(type);
-            if (iterator.hasNext()) {
-                ImageReader reader = iterator.next();
-                reader.setInput(ImageIO.createImageInputStream(
-                        new CloseShieldInputStream(stream)));
-                metadata.set("height", Integer.toString(reader.getHeight(0)));
-                metadata.set("width", Integer.toString(reader.getWidth(0)));
-                reader.dispose();
+            try {
+                Iterator<ImageReader> iterator =
+                    ImageIO.getImageReadersByMIMEType(type);
+                if (iterator.hasNext()) {
+                    ImageReader reader = iterator.next();
+                    reader.setInput(ImageIO.createImageInputStream(
+                            new CloseShieldInputStream(stream)));
+                    metadata.set("height", 
Integer.toString(reader.getHeight(0)));
+                    metadata.set("width", 
Integer.toString(reader.getWidth(0)));
+                    reader.dispose();
+                }
+            } catch (IIOException e) {
+                throw new TikaException(type + " parse error", e);
             }
         }