From 6c41af280a39c17b8baffe322fc7d142fd5ff295 Mon Sep 17 00:00:00 2001
From: Athou <jeremiepanzer@gmail.com>
Date: Sat, 23 Mar 2013 00:26:23 +0100
Subject: [PATCH] convert content to utf8

---
 .../com/commafeed/backend/feeds/FeedFetcher.java  | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/commafeed/backend/feeds/FeedFetcher.java b/src/main/java/com/commafeed/backend/feeds/FeedFetcher.java
index 99a2b0e8..47f658f0 100644
--- a/src/main/java/com/commafeed/backend/feeds/FeedFetcher.java
+++ b/src/main/java/com/commafeed/backend/feeds/FeedFetcher.java
@@ -11,11 +11,13 @@ import javax.ejb.LockType;
 import javax.ejb.Singleton;
 import javax.inject.Inject;
 
+import org.apache.http.HttpEntity;
+import org.apache.http.HttpResponse;
 import org.apache.http.client.HttpClient;
-import org.apache.http.client.ResponseHandler;
 import org.apache.http.client.methods.HttpGet;
-import org.apache.http.impl.client.BasicResponseHandler;
 import org.apache.http.impl.client.DefaultHttpClient;
+import org.apache.http.params.HttpProtocolParams;
+import org.apache.http.util.EntityUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -37,11 +39,14 @@ public class FeedFetcher {
 		Feed feed = null;
 
 		HttpClient httpclient = new DefaultHttpClient();
+		HttpProtocolParams.setContentCharset(httpclient.getParams(), "UTF-8");
+
 		try {
 			HttpGet httpget = new HttpGet(feedUrl);
-			ResponseHandler<String> responseHandler = new BasicResponseHandler();
-			String responseBody = httpclient.execute(httpget, responseHandler);
-			feed = parser.parse(feedUrl, responseBody);
+			HttpResponse response = httpclient.execute(httpget);
+			HttpEntity entity = response.getEntity();
+			String content = EntityUtils.toString(entity, "UTF-8");
+			feed = parser.parse(feedUrl, content);
 		} catch (Exception e) {
 			e.printStackTrace();
 		} finally {