You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by gi...@apache.org on 2007/06/07 08:40:40 UTC

svn commit: r545083 - /cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-impl/src/main/java/org/apache/cocoon/servletservice/DispatcherServlet.java

Author: giacomo
Date: Wed Jun  6 23:40:40 2007
New Revision: 545083

URL: http://svn.apache.org/viewvc?view=rev&rev=545083
Log:
make it compile under Java 1.4

Modified:
    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/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=545083&r1=545082&r2=545083
==============================================================================
--- 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 Wed Jun  6 23:40:40 2007
@@ -54,6 +54,8 @@
     /** The servlet collector bean */
     private Map blockServletCollector;
 
+    private static ThreadLocal prefix = new ThreadLocal();
+    
     public void init() throws ServletException {
         this.log("Block dispatcher was initialized successfully.");        
     }
@@ -89,7 +91,13 @@
 	                " pathInfo=" + request.getPathInfo());
         }
         
-        servlet.service(request, res);
+        prefix.set(req.getServletPath());
+        try {
+            servlet.service(request, res);
+        }
+        finally {
+            prefix.set(null);
+        }
     }
     
     private void getInterfaces(Set interfaces, Class clazz) {