TCK failures: Make valve Async aware - with some help from Filip

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

diff --git a/java/org/apache/catalina/core/StandardContextValve.java b/java/org/apache/catalina/core/StandardContextValve.java
index f47132b..7193589 100644 (file)
--- a/java/org/apache/catalina/core/StandardContextValve.java
+++ b/java/org/apache/catalina/core/StandardContextValve.java
@@ -183,7 +183,9 @@ final class StandardContextValve
                 ServletRequestListener listener =
                     (ServletRequestListener) instances[i];
                 try {
-                    listener.requestInitialized(event);
+                    if (!request.isAsyncDispatching()) {
+                        listener.requestInitialized(event);
+                    }
                 } catch (Throwable t) {
                     container.getLogger().error(sm.getString("standardContext.requestListener.requestInit",
                                      instances[i].getClass().getName()), t);
@@ -210,7 +212,9 @@ final class StandardContextValve
                 ServletRequestListener listener =
                     (ServletRequestListener) instances[j];
                 try {
-                    listener.requestDestroyed(event);
+                    if (!request.isAsyncDispatching()) {
+                        listener.requestDestroyed(event);
+                    }
                 } catch (Throwable t) {
                     container.getLogger().error(sm.getString("standardContext.requestListener.requestDestroy",
                                      instances[j].getClass().getName()), t);