Ensure that calls to StandardWrapper methods() that may trigger creation of a Servlet...

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

diff --git a/java/org/apache/catalina/core/StandardWrapper.java b/java/org/apache/catalina/core/StandardWrapper.java
index 2c154d6..e5023cf 100644 (file)
--- a/java/org/apache/catalina/core/StandardWrapper.java
+++ b/java/org/apache/catalina/core/StandardWrapper.java
@@ -566,8 +566,18 @@ public class StandardWrapper extends ContainerBase
      */
     public boolean isSingleThreadModel() {
 
+        // Short-cuts
+        // If singleThreadModel is true, must have already checked this
+        // If instance != null, must have already loaded 
+        if (singleThreadModel || instance != null) {
+            return singleThreadModel;
+        }
+        
+        // The logic to determine this safely is more complex than one might
+        // expect. allocate() already has the necessary logic so re-use it.
         try {
-            loadServlet();
+            Servlet s = allocate();
+            deallocate(s);
         } catch (Throwable t) {
             ExceptionUtils.handleThrowable(t);
         }
@@ -608,7 +618,9 @@ public class StandardWrapper extends ContainerBase
     @Override
     public String[] getServletMethods() throws ServletException {
 
-        Class<? extends Servlet> servletClazz = loadServlet().getClass();
+        instance = loadServlet();
+        
+        Class<? extends Servlet> servletClazz = instance.getClass();
         if (!javax.servlet.http.HttpServlet.class.isAssignableFrom(
                                                         servletClazz)) {
             return DEFAULT_SERVLET_METHODS;

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 2a99a4b..e87b7a1 100644 (file)
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -109,6 +109,11 @@
         <bug>51588</bug>: Make it easier to extend the AccessLogValve to add
         support for custom elements. (markt)
       </fix>
+      <fix>
+        Ensure that calls to StandardWrapper methods() that may trigger creation
+        of a Servlet instance always do so in way that correctly instantiates a
+        Servlet instance. (markt)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Coyote">