- Add the Jasper listener in the config.

- Fix (harmless) NPE when request processing doesn't proceed (ex: empty path).

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk@432584 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/conf/server.xml b/conf/server.xml
index ccf5ed6..671e8ee 100644 (file)
--- a/conf/server.xml
+++ b/conf/server.xml
@@ -15,6 +15,7 @@
   <!-- Comment these entries out to disable JMX MBeans support used for the 
        administration web application -->
   <Listener className="org.apache.catalina.core.AprLifecycleListener" />
+  <Listener className="org.apache.catalina.core.JasperListener" />
   <Listener className="org.apache.catalina.mbeans.ServerLifecycleListener" />
   <Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener" />
   <!--<Listener className="org.apache.catalina.storeconfig.StoreConfigLifecycleListener"/>-->

diff --git a/java/org/apache/catalina/connector/CoyoteAdapter.java b/java/org/apache/catalina/connector/CoyoteAdapter.java
index 1713a96..70e202b 100644 (file)
--- a/java/org/apache/catalina/connector/CoyoteAdapter.java
+++ b/java/org/apache/catalina/connector/CoyoteAdapter.java
@@ -218,16 +218,18 @@ public class CoyoteAdapter
 
             // Parse and set Catalina and configuration specific 
             // request parameters
-            if ( postParseRequest(req, request, res, response) ) {
+            if (postParseRequest(req, request, res, response)) {
+
                 // Calling the container
                 connector.getContainer().getPipeline().getFirst().invoke(request, response);
-            }
 
-            if (request.getWrapper().getServlet() instanceof CometProcessor 
-                    && !response.isClosed()
-                    && req.getAttribute("org.apache.tomcat.comet.support") == Boolean.TRUE) {
-                comet = true;
-                res.action(ActionCode.ACTION_COMET_BEGIN, null);
+                if (request.getWrapper().getServlet() instanceof CometProcessor 
+                        && !response.isClosed()
+                        && req.getAttribute("org.apache.tomcat.comet.support") == Boolean.TRUE) {
+                    comet = true;
+                    res.action(ActionCode.ACTION_COMET_BEGIN, null);
+                }
+
             }
 
             if (!comet) {

diff --git a/res/confinstall/server_1.xml b/res/confinstall/server_1.xml
index 648e7d5..425e7d8 100644 (file)
--- a/res/confinstall/server_1.xml
+++ b/res/confinstall/server_1.xml
@@ -15,6 +15,7 @@
   <!-- Comment these entries out to disable JMX MBeans support used for the 
        administration web application -->
   <Listener className="org.apache.catalina.core.AprLifecycleListener" />
+  <Listener className="org.apache.catalina.core.JasperListener" />
   <Listener className="org.apache.catalina.mbeans.ServerLifecycleListener" />
   <Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener" />
   <!--<Listener className="org.apache.catalina.storeconfig.StoreConfigLifecycleListener"/>-->