Commit b14fa505 authored by Liang Ding's avatar Liang Ding

🐛 修复 v2.9.4 升级问题

parent a5e14680
...@@ -17,6 +17,8 @@ ...@@ -17,6 +17,8 @@
*/ */
package org.b3log.solo.util.comparator; package org.b3log.solo.util.comparator;
import org.b3log.latke.logging.Level;
import org.b3log.latke.logging.Logger;
import org.b3log.solo.model.Article; import org.b3log.solo.model.Article;
import org.json.JSONObject; import org.json.JSONObject;
...@@ -26,10 +28,15 @@ import java.util.Comparator; ...@@ -26,10 +28,15 @@ import java.util.Comparator;
* Article comparator by create date. * Article comparator by create date.
* *
* @author <a href="http://88250.b3log.org">Liang Ding</a> * @author <a href="http://88250.b3log.org">Liang Ding</a>
* @version 1.0.0.2, Sep 16, 2018 * @version 1.0.1.0, Sep 17, 2018
*/ */
public final class ArticleCreateDateComparator implements Comparator<JSONObject> { public final class ArticleCreateDateComparator implements Comparator<JSONObject> {
/**
* Logger.
*/
private static final Logger LOGGER = Logger.getLogger(ArticleCreateDateComparator.class);
/** /**
* Package default constructor. * Package default constructor.
*/ */
...@@ -44,7 +51,9 @@ public final class ArticleCreateDateComparator implements Comparator<JSONObject> ...@@ -44,7 +51,9 @@ public final class ArticleCreateDateComparator implements Comparator<JSONObject>
return (int) (date2 - date1); return (int) (date2 - date1);
} catch (final Exception e) { } catch (final Exception e) {
throw new IllegalStateException(e); LOGGER.log(Level.ERROR, "Compares create date failed", e);
return 0;
} }
} }
} }
...@@ -17,20 +17,26 @@ ...@@ -17,20 +17,26 @@
*/ */
package org.b3log.solo.util.comparator; package org.b3log.solo.util.comparator;
import org.b3log.latke.logging.Level;
import org.b3log.latke.logging.Logger;
import org.b3log.solo.model.Article; import org.b3log.solo.model.Article;
import org.json.JSONObject; import org.json.JSONObject;
import java.util.Comparator; import java.util.Comparator;
import java.util.Date;
/** /**
* Article comparator by update date. * Article comparator by update date.
* *
* @author <a href="http://88250.b3log.org">Liang Ding</a> * @author <a href="http://88250.b3log.org">Liang Ding</a>
* @version 1.0.0.2, Sep 16, 2018 * @version 1.0.1.0, Sep 17, 2018
*/ */
public final class ArticleUpdateDateComparator implements Comparator<JSONObject> { public final class ArticleUpdateDateComparator implements Comparator<JSONObject> {
/**
* Logger.
*/
private static final Logger LOGGER = Logger.getLogger(ArticleUpdateDateComparator.class);
/** /**
* Package default constructor. * Package default constructor.
*/ */
...@@ -40,12 +46,14 @@ public final class ArticleUpdateDateComparator implements Comparator<JSONObject> ...@@ -40,12 +46,14 @@ public final class ArticleUpdateDateComparator implements Comparator<JSONObject>
@Override @Override
public int compare(final JSONObject article1, final JSONObject article2) { public int compare(final JSONObject article1, final JSONObject article2) {
try { try {
final Date date1 = (Date) article1.get(Article.ARTICLE_UPDATED); final long date1 = article1.getLong(Article.ARTICLE_UPDATED);
final Date date2 = (Date) article2.get(Article.ARTICLE_UPDATED); final long date2 = article2.getLong(Article.ARTICLE_UPDATED);
return date2.compareTo(date1); return (int) (date2 - date1);
} catch (final Exception e) { } catch (final Exception e) {
throw new IllegalStateException(e); LOGGER.log(Level.ERROR, "Compares update date failed", e);
return 0;
} }
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment