2012/5/8 <[email protected]>:
> Author: markt
> Date: Tue May 8 19:07:09 2012
> New Revision: 1335700
>
> URL: http://svn.apache.org/viewvc?rev=1335700&view=rev
> Log:
> It appears that pausing requests for a Context during reload was relying on
> the mapper not being cleaned up correctly. The Lifecycle refactoring cleaned
> up the mapper registrations and broke the handling of paused requests. This
> commit restores that functionality and extends it. The key changes are:
> - Contexts are no longer from the mapper if they are stopped while they are
> paused
> - The CoyoteAdapter pauses for 1s if a request is mapped to a paused Context
> and then tries to re-map it. This replaces the reloading handling in the
> StandardContextValve
> - The reload handling has been removed from the StandardContextValve
> - Editing a watched resource now triggers a reload (that pauses requests
> received during the reload) rather than a stop/start which will return 404s
> for requests received while the context is stopping and starting
>
> As with previous iterations of this feature it is impossible to completely
> eliminate the chances of a 404 without a fair amount of locking that would
> slow things down unnecessarily in production.
>
> Modified:
> tomcat/tc7.0.x/trunk/ (props changed)
> tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
> tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/MapperListener.java
> tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
>
> tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardContextValve.java
> tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java
> tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
>
> Propchange: tomcat/tc7.0.x/trunk/
> ------------------------------------------------------------------------------
> Merged /tomcat/trunk:r1335692
>
> ---
> tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
> (original)
> +++
> tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
> Tue May 8 19:07:09 2012
> @@ -719,7 +719,19 @@ public class CoyoteAdapter implements Ad
> }
> }
> }
> -
> + if (!mapRequired && request.getContext().getPaused()) {
> + // Found a matching context but it is paused. Mapping data
> will
> + // be wrong since some Wrappers may not be registered at this
> + // point.
> + try {
> + Thread.sleep(1000);
> + } catch (InterruptedException e) {
> + // Should never happen
> + }
> + // Reset mapping
> + request.getMappingData().recycle();
> + mapRequired = true;
I think it also needs "version = null"; here.
The version variable is modified in the mapping loop.
> + }
> }
>
> // Possible redirect
>
Best regards,
Konstantin Kolinko
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
