You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by ag...@apache.org on 2006/12/04 18:39:46 UTC
svn commit: r482258 - in
/incubator/roller/branches/roller_3.1/src/org/apache/roller/ui/rendering/servlets:
FeedServlet.java PageServlet.java RSDServlet.java
Author: agilliland
Date: Mon Dec 4 09:39:44 2006
New Revision: 482258
URL: http://svn.apache.org/viewvc?view=rev&rev=482258
Log:
merging changes from revision 482257 in trunk to Roller 3.1 branch. These changes fix an NPE caused by null weblog.lastModified fields.
Modified:
incubator/roller/branches/roller_3.1/src/org/apache/roller/ui/rendering/servlets/FeedServlet.java
incubator/roller/branches/roller_3.1/src/org/apache/roller/ui/rendering/servlets/PageServlet.java
incubator/roller/branches/roller_3.1/src/org/apache/roller/ui/rendering/servlets/RSDServlet.java
Modified: incubator/roller/branches/roller_3.1/src/org/apache/roller/ui/rendering/servlets/FeedServlet.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.1/src/org/apache/roller/ui/rendering/servlets/FeedServlet.java?view=diff&rev=482258&r1=482257&r2=482258
==============================================================================
--- incubator/roller/branches/roller_3.1/src/org/apache/roller/ui/rendering/servlets/FeedServlet.java (original)
+++ incubator/roller/branches/roller_3.1/src/org/apache/roller/ui/rendering/servlets/FeedServlet.java Mon Dec 4 09:39:44 2006
@@ -111,10 +111,10 @@
// determine the lastModified date for this content
- long lastModified = 0;
+ long lastModified = System.currentTimeMillis();
if(isSiteWide) {
lastModified = siteWideCache.getLastModified().getTime();
- } else {
+ } else if (weblog.getLastModified() != null) {
lastModified = weblog.getLastModified().getTime();
}
@@ -124,7 +124,7 @@
}
// set last-modified date
- ModDateHeaderUtil.setLastModifiedHeader(response,lastModified);
+ ModDateHeaderUtil.setLastModifiedHeader(response, lastModified);
// set content type
String accepts = request.getHeader("Accept");
Modified: incubator/roller/branches/roller_3.1/src/org/apache/roller/ui/rendering/servlets/PageServlet.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.1/src/org/apache/roller/ui/rendering/servlets/PageServlet.java?view=diff&rev=482258&r1=482257&r2=482258
==============================================================================
--- incubator/roller/branches/roller_3.1/src/org/apache/roller/ui/rendering/servlets/PageServlet.java (original)
+++ incubator/roller/branches/roller_3.1/src/org/apache/roller/ui/rendering/servlets/PageServlet.java Mon Dec 4 09:39:44 2006
@@ -164,10 +164,10 @@
// determine the lastModified date for this content
- long lastModified = 0;
+ long lastModified = System.currentTimeMillis();
if(isSiteWide) {
lastModified = siteWideCache.getLastModified().getTime();
- } else {
+ } else if (weblog.getLastModified() != null) {
lastModified = weblog.getLastModified().getTime();
}
Modified: incubator/roller/branches/roller_3.1/src/org/apache/roller/ui/rendering/servlets/RSDServlet.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.1/src/org/apache/roller/ui/rendering/servlets/RSDServlet.java?view=diff&rev=482258&r1=482257&r2=482258
==============================================================================
--- incubator/roller/branches/roller_3.1/src/org/apache/roller/ui/rendering/servlets/RSDServlet.java (original)
+++ incubator/roller/branches/roller_3.1/src/org/apache/roller/ui/rendering/servlets/RSDServlet.java Mon Dec 4 09:39:44 2006
@@ -95,7 +95,10 @@
// Respond with 304 Not Modified if it is not modified.
- long lastModified = weblog.getLastModified().getTime();
+ long lastModified = System.currentTimeMillis();
+ if (weblog.getLastModified() != null) {
+ lastModified = weblog.getLastModified().getTime();
+ }
if (ModDateHeaderUtil.respondIfNotModified(request,response,lastModified)) {
return;
}