Improve fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=49414

Just look for presence of CoyoteAdapter class

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

diff --git a/java/org/apache/catalina/loader/WebappClassLoader.java b/java/org/apache/catalina/loader/WebappClassLoader.java
index 13e419b..642ed04 100644 (file)
--- a/java/org/apache/catalina/loader/WebappClassLoader.java
+++ b/java/org/apache/catalina/loader/WebappClassLoader.java
@@ -2260,15 +2260,14 @@ public class WebappClassLoader
             return false;
         }
         
-        // Step through the methods in reverse order looking for a
-        // CoyoteAdapter.service() call. All requests will have this unless
+        // Step through the methods in reverse order looking for calls to any
+        // CoyoteAdapter method. All request threads will have this unless
         // Tomcat has been heavily modified - in which case there isn't much we
         // can do.
         for (int i = 0; i < elements.length; i++) {
             StackTraceElement element = elements[elements.length - (i+1)];
             if ("org.apache.catalina.connector.CoyoteAdapter".equals(
-                    element.getClassName()) &&
-                    "service".equals(element.getMethodName())) {
+                    element.getClassName())) {
                 return true;
             }
         }