svn commit: r1180244 - /tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/image/PSDParser.java

[ni...@apache.org]

Author: nick
Date: Fri Oct  7 21:10:09 2011
New Revision: 1180244

URL: http://svn.apache.org/viewvc?rev=1180244&view=rev
Log:
TIKA-682 Fix 1.6ism

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

Modified: tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/image/PSDParser.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/image/PSDParser.java?rev=1180244&r1=1180243&r2=1180244&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/image/PSDParser.java (original)
+++ tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/image/PSDParser.java Fri Oct  7 21:10:09 2011
@@ -18,15 +18,15 @@ package org.apache.tika.parser.image;
 
 import java.io.IOException;
 import java.io.InputStream;
-import java.nio.charset.Charset;
+import java.io.UnsupportedEncodingException;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.Set;
 
+import org.apache.poi.util.IOUtils;
 import org.apache.tika.exception.TikaException;
 import org.apache.tika.io.EndianUtils;
-import org.apache.poi.util.IOUtils;
 import org.apache.tika.metadata.Metadata;
 import org.apache.tika.metadata.TIFF;
 import org.apache.tika.mime.MediaType;
@@ -181,7 +181,11 @@ public class PSDParser extends AbstractP
        
        private String getDataAsString() {
           // Will be null padded
-          return new String(data, 0, data.length-1, Charset.forName("ASCII"));
+          try {
+             return new String(data, 0, data.length-1, "ASCII");
+          } catch(UnsupportedEncodingException e) {
+             throw new RuntimeException("Something is very broken in your JVM!");
+          }
        }
     }
 }