fix for http://forum.yacy-websuche.de/viewtopic.php?f=5&t=2989

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@7185 6c8d7289-2bf4-0310-a012-ef5d649a1542

source/net/yacy/document/parser/htmlParser.java

@@ -83,14 +83,20 @@ public class htmlParser extends AbstractParser implements Parser {
         // make a scraper
         final ScraperInputStream htmlFilter = new ScraperInputStream(sourceStream,documentCharset,location,null,false);
         String charset = null;
-        try {
+
-            charset = htmlFilter.detectCharset();
+        if (documentCharset != null) {
-        } catch (IOException e1) {
+            charset = patchCharsetEncoding(documentCharset);
-            throw new Parser.Failure("Charset error:" + e1.getMessage(), location);
         }
+        
+        if (charset == null) {
+            try {
+                charset = htmlFilter.detectCharset();
+            } catch (IOException e1) {
+                throw new Parser.Failure("Charset error:" + e1.getMessage(), location);
+            }
+        }
+        
         if (charset == null) {
-            charset = documentCharset;
-        } else {
             charset = patchCharsetEncoding(charset);
         }