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

[kwright]

Author: kwright
Date: Mon Feb 24 00:03:19 2014
New Revision: 1571118

URL: http://svn.apache.org/r1571118
Log:
Fix httpclient deprecations.  Part of CONNECTORS-901

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=1571118&r1=1571117&r2=1571118&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
 Mon Feb 24 00:03:19 2014
@@ -63,12 +63,14 @@ import org.apache.http.conn.params.ConnR
 import org.apache.http.conn.scheme.Scheme;
 import org.apache.http.conn.ssl.SSLSocketFactory;
 import org.apache.http.conn.ssl.AllowAllHostnameVerifier;
+import org.apache.http.entity.ContentType;
 
 import org.apache.http.conn.ConnectTimeoutException;
 import org.apache.http.client.CircularRedirectException;
 import org.apache.http.NoHttpResponseException;
 import org.apache.http.HttpException;
 
+import java.nio.charset.Charset;
 import java.util.*;
 import java.io.*;
 import java.net.*;
@@ -148,6 +150,8 @@ public class WikiConnector extends org.a
     }
   }
 
+  protected static final Charset UTF_8 = Charset.forName("UTF-8");
+
   /** Constructor.
   */
   public WikiConnector()
@@ -1989,7 +1993,7 @@ public class WikiConnector extends org.a
       pairs.add(new BasicNameValuePair(key, params.get(key)));
     }
     
-    method.setEntity(new UrlEncodedFormEntity(pairs, HTTP.UTF_8));
+    method.setEntity(new UrlEncodedFormEntity(pairs, UTF_8));
     
     return method;
   }
@@ -4645,9 +4649,12 @@ public class WikiConnector extends org.a
       InputStream is = entity.getContent();
       try
       {
-        String charSet = EntityUtils.getContentCharSet(entity);
-        if (charSet == null)
-          charSet = "utf-8";
+        ContentType contentType = ContentType.getOrDefault(entity);
+        Charset charSet;
+        if (contentType == null)
+          charSet = UTF_8;
+        else
+          charSet = contentType.getCharset();
         char[] buffer = new char[65536];
         Reader r = new InputStreamReader(is,charSet);
         Writer w = new StringWriter();