You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@manifoldcf.apache.org by kw...@apache.org on 2014/02/25 09:02:48 UTC

svn commit: r1571602 - /manifoldcf/trunk/connectors/wiki/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/wiki/WikiConnector.java

Author: kwright
Date: Tue Feb 25 08:02:48 2014
New Revision: 1571602

URL: http://svn.apache.org/r1571602
Log:
Revise to retain older default functionality

Modified:
    manifoldcf/trunk/connectors/wiki/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/wiki/WikiConnector.java

Modified: manifoldcf/trunk/connectors/wiki/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/wiki/WikiConnector.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/wiki/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/wiki/WikiConnector.java?rev=1571602&r1=1571601&r2=1571602&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/wiki/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/wiki/WikiConnector.java (original)
+++ manifoldcf/trunk/connectors/wiki/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/wiki/WikiConnector.java Tue Feb 25 08:02:48 2014
@@ -4653,15 +4653,15 @@ public class WikiConnector extends org.a
         Charset charSet;
         try
         {
-          ContentType contentType = ContentType.getOrDefault(entity);
-          if (contentType == null)
+          ContentType ct = ContentType.get(entity);
+          if (ct == null)
             charSet = UTF_8;
           else
-            charSet = contentType.getCharset();
+            charSet = ct.getCharset();
         }
         catch (ParseException e)
         {
-          charSet = null;
+          charSet = UTF_8;
         }
         char[] buffer = new char[65536];
         Reader r = new InputStreamReader(is,charSet);