geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xiam...@apache.org
Subject svn commit: r1329127 - in /geronimo/external/trunk/tomcat-parent-7.0.27: ./ catalina/src/main/java/org/apache/catalina/core/ApplicationContext.java
Date Mon, 23 Apr 2012 08:36:54 GMT
Author: xiaming
Date: Mon Apr 23 08:36:53 2012
New Revision: 1329127

URL: http://svn.apache.org/viewvc?rev=1329127&view=rev
Log:
GERONIMO-5622 (bug 49937) A more expansive view of AysncListeners for 7.0.27 fork

Modified:
    geronimo/external/trunk/tomcat-parent-7.0.27/   (props changed)
    geronimo/external/trunk/tomcat-parent-7.0.27/catalina/src/main/java/org/apache/catalina/core/ApplicationContext.java

Propchange: geronimo/external/trunk/tomcat-parent-7.0.27/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Apr 23 08:36:53 2012
@@ -0,0 +1,2 @@
+/geronimo/external/trunk/tomcat-parent-7.0.19:1148322
+/geronimo/external/trunk/tomcat-parent-7.0.23:1230868

Modified: geronimo/external/trunk/tomcat-parent-7.0.27/catalina/src/main/java/org/apache/catalina/core/ApplicationContext.java
URL: http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-parent-7.0.27/catalina/src/main/java/org/apache/catalina/core/ApplicationContext.java?rev=1329127&r1=1329126&r2=1329127&view=diff
==============================================================================
--- geronimo/external/trunk/tomcat-parent-7.0.27/catalina/src/main/java/org/apache/catalina/core/ApplicationContext.java
(original)
+++ geronimo/external/trunk/tomcat-parent-7.0.27/catalina/src/main/java/org/apache/catalina/core/ApplicationContext.java
Mon Apr 23 08:36:53 2012
@@ -39,6 +39,7 @@ import java.util.concurrent.ConcurrentHa
 import javax.naming.Binding;
 import javax.naming.NamingException;
 import javax.naming.directory.DirContext;
+import javax.servlet.AsyncListener;
 import javax.servlet.Filter;
 import javax.servlet.FilterRegistration;
 import javax.servlet.RequestDispatcher;
@@ -1354,7 +1355,11 @@ public class ApplicationContext
             context.addApplicationLifecycleListener(t);
             match = true;
         }
-        
+
+        if (t instanceof AsyncListener) {
+            match = true;
+        }
+
         if (match) return;
         
         if (t instanceof ServletContextListener) {



Mime
View raw message