merge rebase_all

1 files changed, 9 insertions, 15 deletions

diff --git a/src/main/java/com/juick/http/www/RSS.java b/src/main/java/com/juick/http/www/RSS.java
index 72893915..349743b5 100644
--- a/src/main/java/com/juick/http/www/RSS.java
+++ b/src/main/java/com/juick/http/www/RSS.java
@@ -19,16 +19,16 @@ package com.juick.http.www;
 
 import com.juick.Message;
 import com.juick.server.MessagesQueries;
+import org.springframework.jdbc.core.JdbcTemplate;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.PrintWriter;
-import java.sql.Connection;
 import java.text.SimpleDateFormat;
 import java.util.Date;
-import java.util.Iterator;
 import java.util.List;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 
 /**
  *
@@ -36,10 +36,9 @@ import javax.servlet.http.HttpServletResponse;
  */
 public class RSS {
 
-    private static final SimpleDateFormat sdfSQL = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
     private static final SimpleDateFormat sdfRSS = new SimpleDateFormat("EEE, d MMM yyyy HH:mm:ss Z");
 
-    protected void doGet(Connection sql, HttpServletRequest request, HttpServletResponse response, int uid, String uname) throws ServletException, IOException {
+    protected void doGet(JdbcTemplate sql, HttpServletRequest request, HttpServletResponse response, int uid, String uname) throws ServletException, IOException {
         List<Integer> mids = MessagesQueries.getUserBlog(sql, uid, 0, 0);
         if (mids.isEmpty()) {
             response.sendError(404);
@@ -73,14 +72,9 @@ public class RSS {
                 out.println("]]></title>");
                 out.println("<description><![CDATA[" + PageTemplates.formatMessage(msg.getText()) + "]]></description>");
 
-                synchronized (sdfSQL) {
-                    try {
-                        Date date = sdfSQL.parse(msg.TimestampString);
-                        out.println("<pubDate>" + sdfRSS.format(date) + "</pubDate>");
-                    } catch (Exception e) {
-                        System.err.println("PARSE EXCEPTION: " + msg.TimestampString);
-                    }
-                }
+                Date date = msg.getDate();
+                out.println("<pubDate>" + sdfRSS.format(date) + "</pubDate>");
+
 
                 out.println("<comments>http://juick.com/" + msg.getUser().getUName() + "/" + msg.getMID() + "</comments>");
                 if (!msg.Tags.isEmpty()) {