fix NPE when content is empty and fix character encoding issues

This commit is contained in:
Athou
2013-04-05 22:38:35 +02:00
parent 3db578a2d6
commit 648b4017d7
2 changed files with 18 additions and 13 deletions

View File

@@ -27,10 +27,10 @@ public class FeedFetcher {
Feed feed = null;
try {
String content = getter.get(feedUrl);
String extractedUrl = extractFeedUrl(content);
byte[] content = getter.getBinary(feedUrl);
String extractedUrl = extractFeedUrl(new String(content, "UTF-8"));
if (extractedUrl != null) {
content = getter.get(extractedUrl);
content = getter.getBinary(extractedUrl);
feedUrl = extractedUrl;
}
feed = parser.parse(feedUrl, content);