Fix possible NPE when serving STM servlets

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

diff --git a/java/org/apache/catalina/core/StandardWrapper.java b/java/org/apache/catalina/core/StandardWrapper.java
index ba2b2fe..95d857f 100644 (file)
--- a/java/org/apache/catalina/core/StandardWrapper.java
+++ b/java/org/apache/catalina/core/StandardWrapper.java
@@ -1115,10 +1115,11 @@ public class StandardWrapper extends ContainerBase
 
             classLoadTime=(int) (System.currentTimeMillis() -t1);
 
-            singleThreadModel = servlet instanceof SingleThreadModel;
-            if (singleThreadModel) {
-                if (instancePool == null)
+            if (servlet instanceof SingleThreadModel) {
+                if (instancePool == null) {
                     instancePool = new Stack<Servlet>();
+                }
+                singleThreadModel = true;
             }
 
             initServlet(servlet);

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 7ad533d..1408706 100644 (file)
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -186,6 +186,10 @@
         support (enhancement <bug>12428</bug>) that could trigger authentication
         even if preemptive authentication was disabled. (markt) 
       </fix>
+      <fix>
+        Prevent possible NPE when serving Servlets that implement the
+        SingleThreadModel interface. (markt)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Coyote">