Author: kkolinko
Date: Thu Jun 19 19:22:01 2014
New Revision: 1604014
URL: http://svn.apache.org/r1604014
Log:
Additional fix for BZ 56611
and remove method Tomcat$ExistingStandardWrapper.hasAsync(), because
1). This method should have been "final" as it is used by class constructor.
2). Wrapper.isAsyncSupported(), Wrapper.setAsyncSupported() are available as a
replacement.
Modified:
tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java
Modified: tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java?rev=1604014&r1=1604013&r2=1604014&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java Thu Jun 19
19:22:01 2014
@@ -837,15 +837,14 @@ public class Tomcat {
singleThreadModel = true;
instancePool = new Stack<>();
}
- this.asyncSupported = hasAsync();
+ this.asyncSupported = hasAsync(existing);
}
- public boolean hasAsync() {
- if (isAsyncSupported()) return true;
+ private static boolean hasAsync(Servlet existing) {
boolean result = false;
Class<?> clazz = existing.getClass();
- if (clazz.isAnnotationPresent(WebServlet.class)) {
- WebServlet ws = clazz.getAnnotation(WebServlet.class);
+ WebServlet ws = clazz.getAnnotation(WebServlet.class);
+ if (ws != null) {
result = ws.asyncSupported();
}
return result;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
