[jbossweb-commits] JBossWeb SVN: r2153 - in branches/7.2.x: src/main/java/org/apache/catalina/core and 1 other directories.
Author: remy.maucherat(a)jboss.com
Date: 2013-01-22 12:25:15 -0500 (Tue, 22 Jan 2013)
New Revision: 2153
Modified:
branches/7.2.x/src/main/java/org/apache/catalina/connector/Request.java
branches/7.2.x/src/main/java/org/apache/catalina/core/StandardWrapperValve.java
branches/7.2.x/webapps/docs/changelog.xml
Log:
JBWEB-260: Fix state of async context after executing a runnable, since it is allowed to
do something like a dispatch after it [which I did miss].
Modified: branches/7.2.x/src/main/java/org/apache/catalina/connector/Request.java
===================================================================
--- branches/7.2.x/src/main/java/org/apache/catalina/connector/Request.java 2013-01-21
18:47:40 UTC (rev 2152)
+++ branches/7.2.x/src/main/java/org/apache/catalina/connector/Request.java 2013-01-22
17:25:15 UTC (rev 2153)
@@ -3436,6 +3436,12 @@
return runnable;
}
+ public Runnable runRunnable() {
+ Runnable result = runnable;
+ runnable = null;
+ return result;
+ }
+
public void reset() {
servletContext = null;
path = null;
Modified: branches/7.2.x/src/main/java/org/apache/catalina/core/StandardWrapperValve.java
===================================================================
---
branches/7.2.x/src/main/java/org/apache/catalina/core/StandardWrapperValve.java 2013-01-21
18:47:40 UTC (rev 2152)
+++
branches/7.2.x/src/main/java/org/apache/catalina/core/StandardWrapperValve.java 2013-01-22
17:25:15 UTC (rev 2153)
@@ -544,7 +544,7 @@
} else if (asyncContext.getRunnable() != null) {
// Execute the runnable
try {
- asyncContext.getRunnable().run();
+ asyncContext.runRunnable().run();
} catch (Throwable e) {
container.getLogger().error(MESSAGES.asyncRunnableError(getContainer().getName()), e);
asyncContext.setError(e);
Modified: branches/7.2.x/webapps/docs/changelog.xml
===================================================================
--- branches/7.2.x/webapps/docs/changelog.xml 2013-01-21 18:47:40 UTC (rev 2152)
+++ branches/7.2.x/webapps/docs/changelog.xml 2013-01-22 17:25:15 UTC (rev 2153)
@@ -17,6 +17,16 @@
<body>
<section name="JBoss Web 7.2.0.Beta2 (remm)">
+ <subsection name="Catalina">
+ <changelog>
+ <fix>
+ <jira>260</jira>: Async dispatching after executing a runnable
should be possible. (remm)
+ </fix>
+ <fix>
+ <jboss-jira>AS7-5802</jboss-jira>: Fix problem with duplicated
filter instantiation when using a filter registration. (remm)
+ </fix>
+ </changelog>
+ </subsection>
<subsection name="Jasper">
<changelog>
<fix>