fixed encoding bug

[pnews.git] / war / src / main / java / pnews / servlet / ArticleProvider.java

diff --git a/war/src/main/java/pnews/servlet/ArticleProvider.java b/war/src/main/java/pnews/servlet/ArticleProvider.java
index 5e7d429..e578d2a 100644 (file)
--- a/war/src/main/java/pnews/servlet/ArticleProvider.java
+++ b/war/src/main/java/pnews/servlet/ArticleProvider.java
@@ -43,7 +43,6 @@ public class ArticleProvider {
                 XmlReader r;
                 
                 r = new XmlReader(new URL(u));
-                XmlReader.setDefaultEncoding("UTF-8");
                 
                 return new SyndFeedInput().build(r);                
         }
@@ -121,12 +120,13 @@ public class ArticleProvider {
         }
         
         private static Article toArticle(String link, SyndEntry entry, SyndFeed feed) {
-                String desc, title, thumbnail, feedTitle;
+                String desc, title, thumbnail, feedTitle, str;
                 Date date;
                 
                 feedTitle = feed.getTitle();
-                if (feedTitle != null)
+                if (feedTitle != null) {
                         feedTitle = feedTitle.trim();
+                }
                 
                 thumbnail = null;
                 for (SyndEnclosure e: entry.getEnclosures()) {
@@ -137,11 +137,13 @@ public class ArticleProvider {
                 
                 if (thumbnail == null && feed.getImage() != null)
                         thumbnail = feed.getImage().getUrl();
-                                                
+                             
+                
                 title = entry.getTitle().trim();
                 
-                if (entry.getDescription() != null) {                                      
-                        desc = Jsoup.parse(entry.getDescription().getValue()).text();
+                if (entry.getDescription() != null) {
+                        str = entry.getDescription().getValue();
+                        desc = Jsoup.parse(str).text();
                 } else {       
                         desc = null;
                         LOG.severe("No description for " + feedTitle + " - " + title);