You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by gk...@apache.org on 2007/08/18 19:41:26 UTC
svn commit: r567302 - in
/cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-impl/src:
changes/changes.xml
main/java/org/apache/cocoon/servletservice/DispatcherServlet.java
Author: gkossakowski
Date: Sat Aug 18 10:41:25 2007
New Revision: 567302
URL: http://svn.apache.org/viewvc?view=rev&rev=567302
Log:
COCOON-2121: Fixed bug in DispatcherServlet that caused servlet (blocks) mounted at "/" to be handled improperly.
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?view=diff&rev=567302&r1=567301&r2=567302
==============================================================================
--- 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 Sat Aug 18 10:41:25 2007
@@ -24,6 +24,11 @@
+-->
<document>
<body>
+ <release version="1.0.0-RC1-SNAPSHOT" date="2007-00-00" description="unreleased">
+ <action dev="gkossakowski" type="fix" issues="COCOON-2121">
+ Fixed bug in DispatcherServlet that caused servlet (blocks) mounted at "/" to be handled improperly.
+ </action>
+ </release>
<release version="1.0.0-M2-SNAPSHOT" date="2007-00-00" description="unreleased">
</release>
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?view=diff&rev=567302&r1=567301&r2=567302
==============================================================================
--- 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 Sat Aug 18 10:41:25 2007
@@ -78,6 +78,8 @@
servlet = (Servlet) mountableServlets.get(path);
index = path.lastIndexOf('/');
}
+ //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());
}