You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by sn...@apache.org on 2006/10/05 16:10:37 UTC
svn commit: r453244 - in
/incubator/roller/trunk/src/org/apache/roller/planet:
business/hibernate/HibernatePlanetManagerImpl.java pojos/PlanetEntryData.java
Author: snoopdave
Date: Thu Oct 5 07:10:36 2006
New Revision: 453244
URL: http://svn.apache.org/viewvc?view=rev&rev=453244
Log:
Couple more planet fixes
Modified:
incubator/roller/trunk/src/org/apache/roller/planet/business/hibernate/HibernatePlanetManagerImpl.java
incubator/roller/trunk/src/org/apache/roller/planet/pojos/PlanetEntryData.java
Modified: incubator/roller/trunk/src/org/apache/roller/planet/business/hibernate/HibernatePlanetManagerImpl.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/planet/business/hibernate/HibernatePlanetManagerImpl.java?view=diff&rev=453244&r1=453243&r2=453244
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/planet/business/hibernate/HibernatePlanetManagerImpl.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/planet/business/hibernate/HibernatePlanetManagerImpl.java Thu Oct 5 07:10:36 2006
@@ -309,7 +309,7 @@
} else {
StringBuffer sb = new StringBuffer();
sb.append("select e from org.apache.roller.planet.pojos.PlanetEntryData e ");
- sb.append("join e.subscription.groups g");
+ sb.append("join e.subscription.groups g ");
sb.append("where (g.handle='external' or g.handle='all') ");
sb.append("and e.pubTime < :endDate ");
if (startDate != null) {
Modified: incubator/roller/trunk/src/org/apache/roller/planet/pojos/PlanetEntryData.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/planet/pojos/PlanetEntryData.java?view=diff&rev=453244&r1=453243&r2=453244
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/planet/pojos/PlanetEntryData.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/planet/pojos/PlanetEntryData.java Thu Oct 5 07:10:36 2006
@@ -112,7 +112,7 @@
// Play some games to get the date too
if (romeEntry.getPublishedDate() != null) {
setPubTime(new Timestamp(romeEntry.getPublishedDate().getTime())); // use <pubDate>
- } else if (entrydc != null) {
+ } else if (entrydc != null && entrydc.getDate() != null) {
setPubTime(new Timestamp(entrydc.getDate().getTime())); // use <dc:date>
}