svn commit: r557839 - /roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/PageServlet.java

[ag...@apache.org]

Author: agilliland
Date: Thu Jul 19 18:36:59 2007
New Revision: 557839

URL: http://svn.apache.org/viewvc?view=rev&rev=557839
Log:
make sure that if someone is looking for a custom page which doesn't exist, that they get a 404.

Modified:
    roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/PageServlet.java

Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/PageServlet.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/PageServlet.java?view=diff&rev=557839&r1=557838&r2=557839
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/PageServlet.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/PageServlet.java Thu Jul 19 18:36:59 2007
@@ -243,6 +243,14 @@
         } else if("page".equals(pageRequest.getContext())) {
             page = pageRequest.getWeblogPage();
             
+            // if we don't have this page then 404, we don't let
+            // this one fall through to the default template
+            if(page == null) {
+                if(!response.isCommitted()) response.reset();
+                response.sendError(HttpServletResponse.SC_NOT_FOUND);
+                return;
+            }
+            
         // If request specified tags section index, then look for custom template
         } else if("tags".equals(pageRequest.getContext()) &&
                 pageRequest.getTags() == null) {