Return-Path: 
 <cvs-return-32599-apmail-cocoon-cvs-archive=cocoon.apache.org@cocoon.apache.org>
Delivered-To: apmail-cocoon-cvs-archive@www.apache.org
Received: (qmail 31638 invoked from network); 28 Jan 2008 14:17:52 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 28 Jan 2008 14:17:52 -0000
Received: (qmail 10900 invoked by uid 500); 28 Jan 2008 14:17:43 -0000
Delivered-To: apmail-cocoon-cvs-archive@cocoon.apache.org
Received: (qmail 10784 invoked by uid 500); 28 Jan 2008 14:17:43 -0000
Mailing-List: contact cvs-help@cocoon.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@cocoon.apache.org
list-help: <mailto:cvs-help@cocoon.apache.org>
list-unsubscribe: <mailto:cvs-unsubscribe@cocoon.apache.org>
List-Post: <mailto:cvs@cocoon.apache.org>
List-Id: <cvs.cocoon.apache.org>
Delivered-To: mailing list cvs@cocoon.apache.org
Received: (qmail 10772 invoked by uid 99); 28 Jan 2008 14:17:43 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 28 Jan 2008 06:17:43 -0800
X-ASF-Spam-Status: No, hits=-100.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 28 Jan 2008 14:17:37 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 66F421A983E; Mon, 28 Jan 2008 06:17:29 -0800 (PST)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r615889 - in
 /cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-impl/src:
 changes/changes.xml
 main/java/org/apache/cocoon/servletservice/DispatcherServlet.java
Date: Mon, 28 Jan 2008 14:17:29 -0000
To: cvs@cocoon.apache.org
From: gkossakowski@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20080128141729.66F421A983E@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: gkossakowski
Date: Mon Jan 28 06:17:28 2008
New Revision: 615889

URL: http://svn.apache.org/viewvc?rev=615889&view=rev
Log:
<action dev="gkossakowski" type="fix">
  DispatcherServlet does not throw an exception if it fails to find suitable servlet for processing incomming request.
  It returns 404 error and puts information to log about the failure, instead.
</action>

Modified:
    cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-impl/src/changes/changes.xml
    cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-impl/src/main/java/org/apache/cocoon/servletservice/DispatcherServlet.java

Modified: cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-impl/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-impl/src/changes/changes.xml?rev=615889&r1=615888&r2=615889&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-impl/src/changes/changes.xml (original)
+++ cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-impl/src/changes/changes.xml Mon Jan 28 06:17:28 2008
@@ -50,6 +50,10 @@
       <action dev="gkossakowski" type="add" issue="COCOON-2036" due-to="Alexander Klimetschek" due-to-email="alexander.klimetschek@googlemail.com">
         Throw an exception when circular dependencies in servlet connections are detected.
       </action>
+      <action dev="gkossakowski" type="fix">
+      	DispatcherServlet does not throw an exception if it fails to find suitable servlet for processing incomming request. 
+      	It returns 404 error and puts information to log about the failure, instead.
+      </action>
     </release>
   </body>
 </document>

Modified: cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-impl/src/main/java/org/apache/cocoon/servletservice/DispatcherServlet.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-impl/src/main/java/org/apache/cocoon/servletservice/DispatcherServlet.java?rev=615889&r1=615888&r2=615889&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-impl/src/main/java/org/apache/cocoon/servletservice/DispatcherServlet.java (original)
+++ cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-impl/src/main/java/org/apache/cocoon/servletservice/DispatcherServlet.java Mon Jan 28 06:17:28 2008
@@ -82,7 +82,10 @@
         //case when servlet is mounted at "/" must be handled separately
         servlet = servlet == null ? (Servlet) mountableServlets.get("/") : servlet;
         if (servlet == null) {
-            throw new ServletException("No block for " + req.getPathInfo());
+        	String message = "No block for " + req.getPathInfo();
+        	res.sendError(HttpServletResponse.SC_NOT_FOUND, message);
+        	this.logger.info(message);
+            return;
         }
 
         // Create a dynamic proxy class that overwrites the getServletPath and