You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by sl...@apache.org on 2010/02/16 21:39:10 UTC
svn commit: r910680 -
/camel/trunk/components/camel-rss/src/main/java/org/apache/camel/component/rss/RssDateComparator.java
Author: slewis
Date: Tue Feb 16 20:39:10 2010
New Revision: 910680
URL: http://svn.apache.org/viewvc?rev=910680&view=rev
Log:
CAMEL-2214 - NPE thrown from RssDateComparator when using a feed that doesn't parse properly
Modified:
camel/trunk/components/camel-rss/src/main/java/org/apache/camel/component/rss/RssDateComparator.java
Modified: camel/trunk/components/camel-rss/src/main/java/org/apache/camel/component/rss/RssDateComparator.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-rss/src/main/java/org/apache/camel/component/rss/RssDateComparator.java?rev=910680&r1=910679&r2=910680&view=diff
==============================================================================
--- camel/trunk/components/camel-rss/src/main/java/org/apache/camel/component/rss/RssDateComparator.java (original)
+++ camel/trunk/components/camel-rss/src/main/java/org/apache/camel/component/rss/RssDateComparator.java Tue Feb 16 20:39:10 2010
@@ -24,7 +24,12 @@
public class RssDateComparator implements Comparator<SyndEntry> {
public int compare(SyndEntry s1, SyndEntry s2) {
- return getUpdatedDate(s2).compareTo(getUpdatedDate(s1));
+ Date d1 = getUpdatedDate(s1);
+ Date d2 = getUpdatedDate(s2);
+ if ( d2 != null && d1 != null )
+ return d2.compareTo(d1);
+ else
+ return 0;
}
private Date getUpdatedDate(SyndEntry entry) {
@@ -34,4 +39,4 @@
}
return date;
}
-}
\ No newline at end of file
+}