Author: remm
Date: Fri Aug 18 06:44:04 2006
New Revision: 432584
URL: http://svn.apache.org/viewvc?rev=432584&view=rev
Log:
- Add the Jasper listener in the config.
- Fix (harmless) NPE when request processing doesn't proceed (ex: empty path).
Modified:
tomcat/tc6.0.x/trunk/conf/server.xml
tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
tomcat/tc6.0.x/trunk/res/confinstall/server_1.xml
Modified: tomcat/tc6.0.x/trunk/conf/server.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/conf/server.xml?rev=432584&r1=432583&r2=432584&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/conf/server.xml (original)
+++ tomcat/tc6.0.x/trunk/conf/server.xml Fri Aug 18 06:44:04 2006
@@ -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"/>-->
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java?rev=432584&r1=432583&r2=432584&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
Fri Aug 18 06:44:04 2006
@@ -218,16 +218,18 @@
// 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) {
Modified: tomcat/tc6.0.x/trunk/res/confinstall/server_1.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/res/confinstall/server_1.xml?rev=432584&r1=432583&r2=432584&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/res/confinstall/server_1.xml (original)
+++ tomcat/tc6.0.x/trunk/res/confinstall/server_1.xml Fri Aug 18 06:44:04 2006
@@ -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"/>-->
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
